cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo
Conflicts:
docs/html/sdk/installing.jd
Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 25d0a82..e9d20ff 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -1,19 +1,17 @@
page.title=Android SDK
sdk.redirect=0
-sdk.version=2.0.1
-sdk.date=December 2009
sdk.win_download=android-sdk_r04-windows.zip
-sdk.win_bytes=23069119
-sdk.win_checksum=c48b407de852ba483869f17337e90997
+sdk.win_bytes=23449838
+sdk.win_checksum=cc2c51a24e2f876e0fa652e182ef5840
sdk.mac_download=android-sdk_r04-mac_86.zip
-sdk.mac_bytes=19657927
-sdk.mac_checksum=b08512765aa9b0369bb9b8fecdf763e3
+sdk.mac_bytes=19871714
+sdk.mac_checksum=6fcfeed0e1c36624c926551637eb3308
sdk.linux_download=android-sdk_r04-linux_86.tgz
-sdk.linux_bytes=15984887
-sdk.linux_checksum=ef84b08fd9da84f4c4ae77564fe4eaee
+sdk.linux_bytes=16208523
+sdk.linux_checksum=1d695d6a31310406f5d49092a1bd9850
@jd:body
@@ -22,69 +20,52 @@
<p>The steps below provide an overview of how to get started with the Android
SDK. For detailed instructions, start with the <a
-href="{@docRoot}sdk/installing.html">Installing</a> guide. </p>
+href="{@docRoot}sdk/installing.html">Installing the SDK</a> guide. </p>
-<p><strong>0. Prepare your development computer</strong></p>
+<p><strong>1. Prepare your development computer</strong></p>
<p>Read the <a href="{@docRoot}sdk/requirements.html">System Requirements</a>
document and make sure that your development computer meets the hardware and
software requirements for the Android SDK. Install any additional software
-needed before downloading the Android SDK. In particular, if you plan to develop
-Android applications in the Eclipse IDE using the ADT Plugin (see below), make
-sure that you have the correct version of Eclipse installed.
+needed before downloading the Android SDK. In particular, you may need to
+install the <a href="http://java.sun.com/javase/downloads/index.jsp">JDK</a>
+ (version 5 or 6 required) and <a href="http://www.eclipse.org/downloads/">Eclipse</a>
+ (version 3.4 or 3.5, needed only if you want develop using the ADT Plugin).
-<p><strong>1. Download and install the SDK starter package</strong></p>
+<p><strong>2. Download and install the SDK starter package</strong></p>
<p>Select a starter package from the table at the top of this page and download
it to your development computer. To install the SDK, simply unpack the starter
package to a safe location and then add the location to your PATH. </p>
-<p><strong>2. Install the ADT Plugin for Eclipse</strong></p>
+<p><strong>3. Install the ADT Plugin for Eclipse</strong></p>
-<p>If you are developing in Eclipse, set up a remote update site and install the
-Android Development Tools (ADT) plugin. For detailed instructions, see <a
-href="{@docRoot}sdk/eclipse-adt.html">Installing and Updating ADT</a>.</p>
+<p>If you are developing in Eclipse, set up a remote update site at
+<code>https://dl-ssl.google.com/android/eclipse/</code>. Install the Android
+Development Tools (ADT) Plugin, restart Eclipse, and set the "Android"
+preferences in Eclipse to point to the SDK install location. For detailed
+instructions, see <a href="{@docRoot}sdk/eclipse-adt.html">ADT Plugin
+for Eclipse</a>.</p>
-<p><strong>3. Add Android platforms to your SDK</strong></p>
+<p><strong>4. Add Android platforms and other components to your SDK</strong></p>
<p>Use the Android SDK and AVD Manager, included in the SDK starter package, to
-add one or more Android platforms (for example, Android 1.6 or Android 2.0) to
-your SDK. In most cases, you will want to download multiple platforms, so that
-you can build your application on the lowest version you want to support, but
-test against higher versions that you intend the application to run on.
-Information about each platform is available at left, under "Downloadable SDK
-Components."</p>
+add one or more Android platforms (for example, Android 1.6 or Android 2.0) and
+other components to your SDK. If you aren't sure what to add, see <a
+href="installing.html#which">Which components do I need?</a></p>
<p>To launch the Android SDK and AVD Manager on Windows, execute <code>SDK
Setup.exe</code>, at the root of the SDK directory. On Mac OS X or Linux,
execute the <code>android</code> tool in the <code><sdk>/tools/</code>
-folder. For more information about how to add platforms and other components,
-see <a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.
-</p>
+folder. For detailed instructions, see <a
+href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>
-<p><strong>4. Get the latest documentation</strong></p>
-
-<p>If you develop while offline, use the Android SDK and AVD Manager to download
-the latest documentation package. The documentation covers all versions of the
-API and lets you filter out those versions that your application won't support.
-Once installed, the documentation is also available to you directly from the
-Eclipse IDE. When you are online, you can always access the latest documentation
-at the Android Developers site.</p>
-
-<p><strong>5. Download other SDK components</strong></p>
-
-<p>You can use the Android SDK and AVD Manager to download other SDK components,
-such as the SDK add-ons. An SDK add-on provides a development environment for an
-Android external library or a customized Android system image. For example, the
-Google APIs Add-On lets you develop an application that takes advantage of the
-Google Maps external library. </p>
-
-<p><strong>6. Get started with an application project</strong></p>
-
-<p>Once you've set up your SDK, the next step is to start a new application
-project or move existing applications into the new SDK.</p>
+<p><strong>Done!</strong></p>
<p>If you are new to Android, you can use the <a
href="{@docRoot}resources/tutorials/hello-world.html">Hello World</a> tutorial to
get started quickly. <a href="{@docRoot}sdk/installing.html#NextSteps">Next
-Steps</a> offers other suggestions of how to begin. Welcome!</p>
+Steps</a> offers other suggestions of how to begin.</p>
+
+<p>For a more detailed guide to installing and setting up the SDK, read <a
+href="installing.html">Installing the SDK</a>.</p>