3 files changed, 7 insertions, 40 deletions
diff --git a/docs/html/tools/help/monitor.jd b/docs/html/tools/help/monitor.jd
index 18fb49a..8e2ea36 100644
--- a/docs/html/tools/help/monitor.jd
+++ b/docs/html/tools/help/monitor.jd
@@ -1,7 +1,7 @@
-page.title=Device Monitor
+page.title=Debug Monitor
 @jd:body
 
-<p>Android Device Monitor is a stand-alone tool that provides a graphical user interface for
+<p>Android Debug Monitor is a stand-alone tool that provides a graphical user interface for
 several Android application debugging and analysis tools. The Monitor tool does not
 require installation of a integrated development environment, such as Eclipse, and encapsulates the
 following tools:</p>
@@ -16,9 +16,9 @@ following tools:</p>
 
 <h2 id="usage">Usage</h2>
 
-<p>To start Device Monitor, enter the following command from the SDK <code>tools/</code>
+<p>To start Debug Monitor, enter the following command from the SDK <code>tools/</code>
 directory:</p>
   <pre>monitor</pre>
 
-<p>Start an Android emulator or connect an Android device via USB cable, and connect Device
+<p>Start an Android emulator or connect an Android device via USB cable, and connect the Debug
 Monitor to the device by selecting it in the <strong>Devices</strong> window.</p>
diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd
index 1d4e421..947e463 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -97,40 +97,7 @@ padding: 5px 0 0;
   <a href="#" onclick="return toggleDiv(this)">
   <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px"
     width="9px" />
-ADT 20.0.2</a> <em>(July 2012)</em>
-  <div class="toggleme">
-<dl>
-  <dt>Dependencies:</dt>
-
-  <dd>
-    <ul>
-      <li>Java 1.6 or higher is required for ADT 20.0.2.</li>
-      <li>Eclipse Helios (Version 3.6.2) or higher is required for ADT 20.0.2.</li>
-      <li>ADT 20.0.2 is designed for use with <a href="{@docRoot}tools/sdk/tools-notes.html">SDK
-      Tools r20.0.1</a>. If you haven't already installed SDK Tools r20.0.1 into your SDK, use the
-      Android SDK Manager to do so.</li>
-    </ul>
-  </dd>
-
-  <dt>Bug fixes:</dt>
-  <dd>
-    <ul>
-      <li>Fixed keybindings in various XML editors for Eclipse 4.x.</li>
-      <li>Fixed bug when creating layout configurations that already exist.</li>
-    </ul>
-  </dd>
-
-</dl>
-
-</div>
-</div>
-
-
-<div class="toggleable closed">
-  <a href="#" onclick="return toggleDiv(this)">
-  <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px"
-    width="9px" />
-ADT 20.0.1</a> <em>(July 2012)</em>
+ADT 20.0.1</a> <em>(June 2012)</em>
   <div class="toggleme">
 <dl>
   <dt>Dependencies:</dt>
diff --git a/docs/html/tools/sdk/ndk/index.jd b/docs/html/tools/sdk/ndk/index.jd
index 216a304..064b2c3 100644
--- a/docs/html/tools/sdk/ndk/index.jd
+++ b/docs/html/tools/sdk/ndk/index.jd
@@ -161,10 +161,10 @@ MIPS.</li>
 co-exist with the original GCC 4.4.3 toolchain ({@code binutils} 2.19 and GDB 6.6).</p>
             <ul>
               <li>GCC 4.6 is now the default toolchain. You may set {@code
-NDK_TOOLCHAIN_VERSION=4.4.3} in {@code Android.mk} to select the original one.</li>
+NDK_TOOLCHAIN_VERSION=4.4.3} in {@code Application.mk} to select the original one.</li>
               <li>Support for the {@code gold} linker is only available for ARM and x86
 architectures on Linux and Mac OS hosts. This support is disabled by default. Add {@code
-LOCAL_C_FLAGS += -fuse-ld=gold} in {@code Android.mk} to enable it.</li>
+LOCAL_LDLIBS += -fuse-ld=gold} in {@code Android.mk} to enable it.</li>
               <li>Programs compiled with {@code -fPIE} require the new {@code GDB} for debugging,
 including binaries in Android 4.1 (API Level 16) system images.</li>
               <li>The {@code binutils} 2.21 {@code ld} tool contains back-ported fixes from