summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-01-14 13:05:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-14 13:05:46 -0800
commit7cc57ff22d23daa62e07e0f3d28010d75ed19eea (patch)
tree83ff8cbea9734195252a625a6871e6e9432cf436
parentf95e3dd23cb6cbd7a86dece3c4bafff71307721a (diff)
parent0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb (diff)
downloadframeworks_base-7cc57ff22d23daa62e07e0f3d28010d75ed19eea.zip
frameworks_base-7cc57ff22d23daa62e07e0f3d28010d75ed19eea.tar.gz
frameworks_base-7cc57ff22d23daa62e07e0f3d28010d75ed19eea.tar.bz2
am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair
Merge commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb' into eclair-plus-aosp * commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb': docs: remove dev guide link from download confirmation content
-rw-r--r--docs/html/sdk/download.jd6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/sdk/download.jd b/docs/html/sdk/download.jd
index 47505e6..029de21 100644
--- a/docs/html/sdk/download.jd
+++ b/docs/html/sdk/download.jd
@@ -58,10 +58,8 @@ The License Agreement constitutes a contract between you and Google with respect
<h2>Thank you for downloading the Android SDK!</h2>
<p>Your download should be underway. If not, <a id="click-download">click here to start the download</a>.</p>
<p>To set up your Android development environment, please read the guide to
- <a href="installing.html">Installing the Android SDK</a>.
- Once you have completed the installation, see the
- <a href="/guide/index.html">Dev Guide</a> for documentation about
- developing Android applications.</p>
+ <a href="installing.html">Installing the Android SDK</a> and ensure that your development
+ machine meets the system requirements linked on that page.</p>
</div>
<script type="text/javascript">