cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.

Change-Id: Ic205588bb0ecd5660b8c8949da88fbae6981f416
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index e9d20ff..e10c408 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -1,15 +1,15 @@
 page.title=Android SDK
 sdk.redirect=0
 
-sdk.win_download=android-sdk_r04-windows.zip
+sdk.win_download=android-sdk_r05-windows.zip
 sdk.win_bytes=23449838
 sdk.win_checksum=cc2c51a24e2f876e0fa652e182ef5840
 
-sdk.mac_download=android-sdk_r04-mac_86.zip
+sdk.mac_download=android-sdk_r05-mac_86.zip
 sdk.mac_bytes=19871714
 sdk.mac_checksum=6fcfeed0e1c36624c926551637eb3308
 
-sdk.linux_download=android-sdk_r04-linux_86.tgz
+sdk.linux_download=android-sdk_r05-linux_86.tgz
 sdk.linux_bytes=16208523
 sdk.linux_checksum=1d695d6a31310406f5d49092a1bd9850
 
diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd
index 3db226f..c60782f 100644
--- a/docs/html/sdk/tools-notes.jd
+++ b/docs/html/sdk/tools-notes.jd
@@ -8,10 +8,12 @@
 href="{@docRoot}sdk/index.html">SDK starter package</a> installs the
 latest revision of the SDK Tools in the <code>&lt;sdk&gt;/tools</code> directory.</p>
 
-<p>If you are already using the SDK Tools, you should update to the latest revision by
-using the Android SDK and AVD Manager (rather than by downloading a new SDK package).
-For more information about how to update, see <a 
-href="{@docRoot}sdk/adding-components.html#UpdatingComponents">Adding SDK Components</a>. </p>
+<p>If you are already using the SDK and you want to update to the latest version
+of the SDK Tools, use the <em>Android SDK and AVD Manager</em> to get the
+update, rather than downloading a new SDK starter package. For more information
+about how to update, see <a
+href="{@docRoot}sdk/adding-components.html#UpdatingComponents">Updating SDK
+Components</a>. </p>
 
 <h2 id="notes">Revisions</h2>