commit af0092dc7e3e9657bc290824c3fec408e3309849
author Scott Main Wed Apr 29 13:35:45 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Apr 29 13:35:45 2009 -0700
tree f46e3fd08ccbb8f3c2d0fd926fdd716cd1dcf43e
parent 124217d186c0850613fad897f6f87dcca8581f67
parent dfe88ae496494fb95782e3c028a53069e951f89e

am dfe88ae: am 0ee4f86: AI 147811: typo fixes and edits for upgrading an

Merge commit 'dfe88ae496494fb95782e3c028a53069e951f89e'

* commit 'dfe88ae496494fb95782e3c028a53069e951f89e':
  AI 147811: typo fixes and edits for upgrading and installing docs

docs/html/sdk/1.5_r1/installing.jd

diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd
index c388b84..ac6af61 100644
--- a/docs/html/sdk/1.5_r1/installing.jd
+++ b/docs/html/sdk/1.5_r1/installing.jd
@@ -131,8 +131,8 @@
     <li>You should now see the new site added to the search list (and checked).
         Click <strong>Finish</strong>. </li>
     <li>In the subsequent Search Results dialog box, select the checkbox for the
-    <strong>Android Plugin</strong>.
-    This will select the nested tools: "Android DDMS" and "Android Developer Tools". 
+    "Android Plugin".
+    This will select the nested tools: "Android DDMS" and "Android Development Tools". 
     Click <strong>Next</strong>.</li>
     <li>Read and accept the license agreement, then click <strong>Next</strong>. </li>
     <li>On the following Installation window, click <strong>Finish</strong>. </li>
@@ -157,7 +157,7 @@
     <li>Back in the Available Software view, you should see the plugin listed by the URL,
     with "Developer Tools" nested within it. Select the checkbox next to 
       Developer Tools and click <strong>Install...</strong></li>
-    <li>On the subsequent Install window, "Android DDMS" and "Android Developer Tools"
+    <li>On the subsequent Install window, "Android DDMS" and "Android Development Tools"
     should both be checked. Click <strong>Next</strong>. </li>
     <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
     <li>Restart Eclipse. </li>

docs/html/sdk/1.5_r1/upgrading.jd

diff --git a/docs/html/sdk/1.5_r1/upgrading.jd b/docs/html/sdk/1.5_r1/upgrading.jd
index 8071f49..0a12d62 100644
--- a/docs/html/sdk/1.5_r1/upgrading.jd
+++ b/docs/html/sdk/1.5_r1/upgrading.jd
@@ -157,7 +157,9 @@
       <p>(Your original entry for the plugin should still be here. If not, see the guide
       to <a href="{@docRoot}sdk/1.5_r1/installing.html#installingplugin">Installing the ADT Plugin</a>.)
       </p></li>
-    <li>In the results, be sure that "Developer Tools" is checked, then click <strong>Next</strong>.</li>
+    <li>In the results, expand the entry for the Android plugin and
+      be sure that "Developer Tools" is checked, then click <strong>Next</strong>.
+      (This will install "Android DDMS" and "Android Development Tools".)</li>
     <li>Read and accept the license agreement, then click <strong>Next</strong>.
     <li>In the next window, click <strong>Finish</strong> to start installation.</li>
     <li>The ADT plugin is not digitally signed. Accept the installation anyway by clicking 
@@ -171,10 +173,10 @@
     <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong>.</li>
     <li>Select the <strong>Available Software</strong> tab.</li>
     <li>Expand the entry for the Andriod plugin (may be listed as the location URL)
-      and select "Developer Tools" by checking the box next to it, then click <strong>Install</strong>.
-    </li>On the next window, "Android DDMS" and "Android Developer Tools" 
-    should both be checked. Click <strong>Next</strong>.</li>
-    <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
+      and select "Developer Tools" by checking the box next to it, then click 
+      <strong>Install</strong>.</li>
+    <li>On the next window, "Android DDMS" and "Android Development Tools" 
+    should both be checked. Click <strong>Finish</strong>.</li>
     <li>Restart Eclipse.</li>
 </ol>
 </td>