diff --git a/docs/html/guide/developing/debugging/ddms.jd b/docs/html/guide/developing/debugging/ddms.jd
index d22ad2f..8f5e706 100644
--- a/docs/html/guide/developing/debugging/ddms.jd
+++ b/docs/html/guide/developing/debugging/ddms.jd
@@ -280,5 +280,5 @@
   </ul>
   
   For more information about providing mock location data, see 
-  <a href="guide/topics/location/obtaining-user-location.html#MockData">Obtaining User Location</a>.
+  <a href="{@docRoot}guide/topics/location/obtaining-user-location.html#MockData">Obtaining User Location</a>.
   
diff --git a/docs/html/guide/developing/debugging/debugging-tracing.jd b/docs/html/guide/developing/debugging/debugging-tracing.jd
index cfa1bb1..dcc889d 100644
--- a/docs/html/guide/developing/debugging/debugging-tracing.jd
+++ b/docs/html/guide/developing/debugging/debugging-tracing.jd
@@ -204,9 +204,9 @@
   <h2 id="creatingtracefiles">Creating Trace Files</h2>
 
   <p>To use Traceview, you need to generate log files containing the trace information you want to
-  analyze.<p>
+  analyze.</p>
   
-  <p>There are two ways to generate trace logs:<p>
+  <p>There are two ways to generate trace logs:</p>
   <ul>
     <li>Include the {@link android.os.Debug} class in your code and call its
   methods to start and stop logging of trace information to disk. This method is very precise because
@@ -293,7 +293,7 @@
   <p class="note"><strong>Note:</strong> If you are trying to view the trace logs of an application 
   that is built with ProGuard enabled (release mode build), some method and member names might be obfuscated.
   You can use the Proguard <code>mapping.txt</code> file to figure out the original unobfuscated names. For more information
-  on this file, see the <a href="{@docRoot}/guide/developing/tools/proguard.html>Proguard</a> documentation.</p>
+  on this file, see the <a href="{@docRoot}guide/developing/tools/proguard.html">Proguard</a> documentation.</p>
 
       <h2 id="dmtracedump">Using dmtracdedump</h2>
 
@@ -308,7 +308,7 @@
       "{@docRoot}images/tracedump.png"
           width="485"
           height="401" />
-       <p class="image-caption><strong>Figure 3.</strong> Screenshot of dmtracedump</p>
+       <p class="image-caption"><strong>Figure 3.</strong> Screenshot of dmtracedump</p>
 
       <p>For each node, dmtracedump shows <code>&lt;ref&gt;
       <em>callname</em> (&lt;inc-ms&gt;, &lt;exc-ms&gt;,&lt;numcalls&gt;)</code>, where</p>
@@ -378,8 +378,6 @@
           is 20%.</td>
         </tr>
       </table>
-    </dd>
-  </dl>
   
   
     
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 337b6d8..4bed963c 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -41,7 +41,7 @@
 
 <p class="note"><strong>Note:</strong> When developing on a device, keep in mind that you should
 still use the <a
-href="{@docRoot}guide/developing/tools/emulator.html">Android emulator</a> to test your application
+href="{@docRoot}guide/developing/devices/emulator.html">Android emulator</a> to test your application
 on configurations that are not equivalent to those of your real device. Although the emulator
 does not allow you to test every device feature (such as the accelerometer), it does
 allow you to verify that your application functions properly on different versions of the Android
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
index f20e016b..c603780 100644
--- a/docs/html/guide/developing/tools/index.jd
+++ b/docs/html/guide/developing/tools/index.jd
@@ -10,75 +10,76 @@
 applications on the emulator. </p>
 
  <dl>
-  <dt><a href="{@docRoot}sdk/eclipse-adt.html">Android Development Tools Plugin</a> (for the Eclipse IDE)</dt>
-          <dd>The ADT plugin adds powerful extensions to the Eclipse integrated environment, 
-          making creating and debugging your Android applications easier and faster.</dd>          
+  <dt><a href="adb.html">Android Debug Bridge</a></dt>
+    <dd>A versatile tool lets you manage the state of an emulator instance
+    or Android-powered device.</dd>    
+
+   <dt><a href="android.html">android</a></dt>
+     <dd>Lets you manage AVDs, projects, and the installed components of the SDK.
+     </dd>
+
+  <dt><a href="bmgr.html">bmgr</a></dt>
+
+    <dd>Lets you interact with the Backup Manager on Android devices
+    supporting API Level 8 or greater. It provides commands to invoke backup and restore operations
+    so that you don't need to repeatedly wipe data or take similar intrusive steps in order to test
+    your application's backup agent. These commands are accessed via the adb shell.
+    </dd>
+
+  <dt><a href="dmtracedump.html">dmtracedump</a></dt>
+
+    <dd>Generates graphical call-stack diagrams from trace log files.
+    The tool uses the Graphviz Dot utility to create the graphical output, so you need to install
+    Graphviz before running <code>dmtracedump</code>. For more information on using <code>dmtracedump</code>, see
+    <a href="{@docRoot}guide/developing/debugging/debugging-tracing.html#dmtracedump">Profiling with
+    Traceview and dmtracedump</a>
+    </dd>
+
+    <dt><a href="draw9patch.html">Draw 9-patch</a></dt>
+	    <dd>Allows you to easily create a {@link android.graphics.NinePatch} graphic using a WYSIWYG editor.
+	    It also previews stretched versions of the image, and highlights the area in which content is allowed.
+	    </dd>
+
   <dt><a href="emulator.html">Android Emulator</a></dt>
     <dd>A QEMU-based device-emulation tool that you can use to design,
     debug, and test your applications in an actual Android run-time environment. </dd>
 
+  <dt><a href="hprof-conv.html">hprof-conv</a></dt>
 
-  <dt><a href="bmgr.html">bmgr</a></dt>
+    <dd>Converts the HPROF file that is generated by the Android SDK tools to a
+    standard format so you can view the file in a profiling tool of your choice.</dd>
 
-    <dd>A shell tool you can use to interact with the Backup Manager on Android devices
-    supporting API Level 8 or greater. It provides commands to invoke backup and restore operations
-    so that you don't need to repeatedly wipe data or take similar intrusive steps in order to test
-    your application's backup agent. These commands are accessed via the adb shell.
-    </dd>  
-    
- <dt><a href="layoutopt.html">layoutopt</a></dt>
-    <dd>This tool lets you quickly analyze your application's layouts in order to
+  <dt><a href="layoutopt.html">layoutopt</a></dt>
+    <dd>Lets you quickly analyze your application's layouts in order to
     optimize them for efficiency.
     </dd>
 
-
-	  <dt><a href="draw9patch.html">Draw 9-patch</a></dt>
-	    <dd>The Draw 9-patch tool allows you to easily create a 
-	    {@link android.graphics.NinePatch} graphic using a WYSIWYG editor. It also previews stretched 
-	     versions of the image, and highlights the area in which content is allowed.
-	    </dd>
-			
-
-  <dt><a href="adb.html" >Android Debug Bridge</a> (adb)</dt>
-                  <dd>The adb tool lets you install your application's .apk files on an
-                  emulator or device and access the emulator or device from a command line.
-                  You can also use it to link a standard debugger to application code running
-                  on an Android emulator or device.
-                <p>This is located in {@code &lt;sdk&gt;/platform-tools/}.</p></dd>
-
-  <dt><a href="hprof-conv.html">hprof-conv</a></dt>
-
-    <dd>A tool that converts the HPROF file that is generated by the Android SDK tools to a
-    standard format so you can view the file in a profiling tool of your choice.</dd>
-    
-  <dt><a href="sqlite3.html">sqlite3</a></dt>
-      <dd>Included as a convenience, this tool lets you access the SQLite data 
-      files created and used by Android applications.</dd>
+  <dt><a href="mksdcard.html">logcat</a></dt>
+      <dd>Lets you read system log messages that are output on an Android device or emulator.</dd>
 
   <dt><a href="mksdcard.html">mksdcard</a></dt>
-            <dd>Helps you create a disk image that you can use with the emulator, 
-                      to simulate the presence of an external storage card (such as an SD card).</dd>
-                      
-  <dt><a href="monkey.html">UI/Application 
+      <dd>Helps you create a disk image that you can use with the emulator, 
+      to simulate the presence of an external storage card (such as an SD card).</dd>
 
-  Exerciser Monkey</a></dt>
-      <dd>A program that runs on your emulator or device and generates pseudo-random
+  <dt><a href="monkey.html">Monkey</a></dt>
+      <dd>Runs on your emulator or device and generates pseudo-random
       streams of user events such as clicks, touches, or gestures, as well as a number of system-level events.
       You can use the Monkey to stress-test applications that you are developing, in a random yet repeatable manner.</dd>
 
+  <dt><a href="monkeyrunner_concepts.html">monkeyrunner</a></dt>
+      <dd>Provides an API for writing programs that control an Android device
+      or emulator from outside of Android code.</dd>
 
-  <dt><a  href="android.html">android</a></dt>
-            <dd>A script that lets you manage AVDs and generate <a
-                        href="http://ant.apache.org/" title="Ant">Ant</a> build files that
-                        you can use to compile your Android applications. </dd>
+  <dt><a href="proguard.html">ProGuard</a></dt>
+      <dd>Shrinks, optimizes, and obfuscates your code by removing unused code and renaming classes,
+      fields, and methods with semantically obscure names.</dd>
 
-  <dt><a  href="zipalign.html">zipalign</a></dt>
-            <dd>An important .apk optimization tool. This tool ensures that all uncompressed data starts
+  <dt><a href="sqlite3.html">sqlite3</a></dt>
+      <dd>Lets you access the SQLite data files created and used by Android applications.</dd>
+
+  <dt><a href="zipalign.html">zipalign</a></dt>
+            <dd>Optimizes <code>.apk</code> files by ensuring that all uncompressed data starts
             with a particular alignment relative to the start of the file. This should always be used
             to align .apk files after they have been signed.</dd>
-            
-
-    
-
 </dl>
 
diff --git a/docs/html/guide/developing/tools/monkey.jd b/docs/html/guide/developing/tools/monkey.jd
index 9a2ab6f..6c05934 100644
--- a/docs/html/guide/developing/tools/monkey.jd
+++ b/docs/html/guide/developing/tools/monkey.jd
@@ -185,7 +185,7 @@
 <td>If set, this option will generate profiling reports immediately before and after
 the Monkey event sequence.
 This will generate large (~5Mb) files in data/misc, so use with care.  See 
-<a href="{@docRoot}guide/developing/tools/traceview.html" title="traceview">Traceview</a> for more information
+<a href="{@docRoot}guide/developing/debugging/debugging-tracing.html" title="traceview">Traceview</a> for more information
 on trace files.</td>
 </tr>
 
diff --git a/docs/html/guide/practices/design/performance.jd b/docs/html/guide/practices/design/performance.jd
index f5588ac..97b31cf 100644
--- a/docs/html/guide/practices/design/performance.jd
+++ b/docs/html/guide/practices/design/performance.jd
@@ -425,7 +425,7 @@
 to run your own microbenchmarks.</p>
 
 <p>You may also find
-<a href="{@docRoot}guide/developing/tools/traceview.html">Traceview</a> useful
+<a href="{@docRoot}guide/developing/debugging/debugging-tracing.html">Traceview</a> useful
 for profiling, but it's important to realize that it currently disables the JIT,
 which may cause it to misattribute time to code that the JIT may be able to win
 back. It's especially important after making changes suggested by Traceview
diff --git a/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd
index 0d59b56..34f7063 100644
--- a/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd
+++ b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd
@@ -65,6 +65,6 @@
 
 <p>The Android Eclipse plugin not only offers excellent debugging support for
 your application development, but also superb profiling support. You can also
-try using <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview</a> to profile your application. If your application is running too slow, this can help you 
+try using <a href="{@docRoot}guide/developing/debugging/debugging-tracing.html">Traceview</a> to profile your application. If your application is running too slow, this can help you 
 find the bottlenecks and fix them.</p>
 
diff --git a/docs/html/resources/tutorials/views/hello-mapview.jd b/docs/html/resources/tutorials/views/hello-mapview.jd
index 9ea635c..836d22c 100644
--- a/docs/html/resources/tutorials/views/hello-mapview.jd
+++ b/docs/html/resources/tutorials/views/hello-mapview.jd
@@ -17,13 +17,13 @@
 
 <p>After installing the Google APIs add-on in your SDK, set your project properties to use the build
 target called "Google APIs by Google Inc.". See the instructions for setting a build
-target in <a href="{@docRoot}guide/developing/eclipse-adt.html">Developing in
-Eclipse with ADT</a> or <a
-href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>,
-as appropriate for your environment. </p>
+target in <a href="{@docRoot}guide/developing/projects/projects-eclipse.html#CreatingAProject">
+Creating and Managing Projects in Eclipse</a> or <a
+href="{@docRoot}guide/developing/projects/projects-cmdline.html#CreatingAProject">
+Creating and Managing Projects on the Command Line</a>, as appropriate for your environment.</p>
 
 <p>You will also need to set up a new AVD that uses the same Google APIs deployment target. See <a
-href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a> for
+href="{@docRoot}guide/developing/devices/index.html">Creating and Managing Virtual Devices</a> for
 more information.</p>
 
 <p>For reference material, see the <a
@@ -127,7 +127,7 @@
 </pre>
 </li>
 <li>That's all there is to it. Run the application. (Remember, you must have an <a
-href="{@docRoot}guide/developing/tools/avd.html">AVD</a> configured to use the Google APIs
+href="{@docRoot}guide/developing/devices/index.html">AVD</a> configured to use the Google APIs
 target, or be using a development device that includes the Maps library.)</li>
 </ol>