Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe88ae4 authored by Scott Main's avatar Scott Main Committed by The Android Open Source Project
Browse files

am 0ee4f86c: AI 147811: typo fixes and edits for upgrading and installing 

Merge commit '0ee4f86c' into donut

* commit '0ee4f86c':
  AI 147811: typo fixes and edits for upgrading and installing docs
parents 7e356141 0ee4f86c

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

+3 −3
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ and click <strong>Next</strong>. </li> 
    <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 @@ and click <strong>Next</strong>. </li> 
    <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

+7 −5
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ uninstall procedure and continue to <a href="#installAdt">Install the 0.9 ADT pl 
      <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 @@ uninstall procedure and continue to <a href="#installAdt">Install the 0.9 ADT pl 
    <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>