diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index e8d2416..f8d32e7 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -13,7 +13,7 @@
         <li><a href="#RunningOnDevice">Running on a device</a></li>
       </ol>
     </li>
-    <li><a href="#RunConfig">Creating a Custom Run Configuration</a></li>
+    <li><a href="#RunConfig">Creating a Run Configuration</a></li>
     <li><a href="#Signing">Setting Up Application Signing</a></li>
     <li><a href="#libraryProject">Working with Library Projects</a>
       <ol>
@@ -222,7 +222,7 @@
 
 <p>To set or change the launch configuration used for your project, use the launch configuration
 manager.
-See <a href="#launchconfig">Creating a Launch Configuration</a> for information.</p>
+See <a href="#RunConfig">Creating a Run Configuration</a> for information.</p>
 
 <p>Be certain to create multiple AVDs upon which to test your application. You should have one AVD
 for each platform and screen type with which your application is compatible. For
@@ -296,7 +296,7 @@
   <li>Adjust your desired launch configuration settings.
     <p>In the Target tab, consider whether you'd like to use Manual or Automatic mode
     when selecting an AVD to run your application.
-    See the following section on <a href=#AutoAndManualModes">Automatic and manual target 
+    See the following section on <a href="#AutoAndManualTargetModes">Automatic and manual target 
     modes</a>).</p>
     <p>You can specify any emulator options to the Additional Emulator Command
     Line Options field. For example, you could add <code>-scale 96dpi</code> to
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
index 95b3680..234b18f 100644
--- a/docs/html/guide/developing/other-ide.jd
+++ b/docs/html/guide/developing/other-ide.jd
@@ -804,7 +804,7 @@
 
 <p>To build an application project that depends on one or more library projects,
 you can use the standard Ant build commands and compile modes, as described in
-<a href=#Building">Building Your Application</a>, earlier in this document. The
+<a href="#Building">Building Your Application</a>, earlier in this document. The
 tools compile and merge all libraries referenced by the application as part
 of compiling the dependent application project. No additional commands or steps
 are necessary. </p>
diff --git a/docs/html/guide/developing/testing/testing_eclipse.jd b/docs/html/guide/developing/testing/testing_eclipse.jd
index ba7eaba..370c142 100644
--- a/docs/html/guide/developing/testing/testing_eclipse.jd
+++ b/docs/html/guide/developing/testing/testing_eclipse.jd
@@ -505,15 +505,14 @@
     pane and moves the focus to the first line of the test method.
 </p>
 <p>
-    The results of a successful test are shown in
-    <a href="#TestResults">Figure 1. Messages for a successful test</a>:
+    The results of a successful test are shown in figure 1.
 </p>
 <a href="{@docRoot}images/testing/eclipse_test_results.png">
     <img src="{@docRoot}images/testing/eclipse_test_results.png"
          alt="Messages for a successful test" height="327px" id="TestResults"/>
 </a>
 <p class="img-caption">
-    <strong>Figure 1.</strong> Messages for a successful test
+    <strong>Figure 1.</strong> Messages for a successful test.
 </p>
 <p>
     The lower pane is for stack traces. If you highlight a failed test in the upper pane, the
@@ -521,14 +520,11 @@
     test code, you can double-click it to display the code in an editor view pane, with the
     line highlighted. For a successful test, the lower pane is empty.
 </p>
-<p>
-    The results of a failed test are shown in
-    <a href="#FailedTestResults">Figure 2. Messages for a test failure</a>
-</p>
+<p>The results of a failed test are shown in figure 2.</p>
 <a href="{@docRoot}images/testing/eclipse_test_run_failure.png">
     <img src="{@docRoot}images/testing/eclipse_test_run_failure.png"
-         alt="Messages for a test failure" height="372px" id="TestRun"/>
+         alt="" height="372px" id="TestRun"/>
 </a>
 <p class="img-caption">
-    <strong>Figure 2.</strong> Messages for a test failure
+    <strong>Figure 2.</strong> Messages for a test failure.
 </p>
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index b70be07..f503749 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -214,7 +214,7 @@
 <p class="table-caption" id="screens-table"><strong>Table 1.</strong> Screen
 sizes and densities of emulator skins included in the Android SDK.</p>
 
-  <table id="screens-table">
+  <table>
     <tbody>
     <tr>
       <td style="border:none"></td>
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
index 6758054..c7e1c79 100644
--- a/docs/html/guide/publishing/app-signing.jd
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -563,7 +563,7 @@
 it will also perfom package alignment with {@code zipalign}.
 Because the Export Wizard uses both Keytool and Jarsigner, you should
 ensure that they are accessible on your computer, as described above
-in the <a href=#setup">Basic Setup for Signing</a>.</p>
+in the <a href="#setup">Basic Setup for Signing</a>.</p>
 
 <p>To create a signed and aligned .apk in Eclipse:</p>
 
diff --git a/docs/html/guide/publishing/preparing.jd b/docs/html/guide/publishing/preparing.jd
index 45a5b77..f471961 100644
--- a/docs/html/guide/publishing/preparing.jd
+++ b/docs/html/guide/publishing/preparing.jd
@@ -89,7 +89,7 @@
 <p>To protect your person, organization, and intellectual property, you may want
 to provide an End User License Agreement (EULA) with your application. 
 
-<h3 id="eula">3. Consider adding support for Android Market Licensing</h3>
+<h3>3. Consider adding support for Android Market Licensing</h3>
 
 <p>If you are publishing a paid application through Android Market, consider
 adding support for Android Market Licensing. Licensing lets you control access
diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd
index b646247..01bfba8 100644
--- a/docs/html/guide/publishing/versioning.jd
+++ b/docs/html/guide/publishing/versioning.jd
@@ -16,7 +16,7 @@
 <h2>In this document</h2>
 
 <ol>
-<li><a href="#appversion">Setting Application Version</a></li>
+<li><a href="#appversioning">Setting Application Version</a></li>
 <li><a href="#minsdkversion">Specifying Your Application's System API Requirements</a>
 </ol>
 
diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd
index 7661a0e..dec2146 100644
--- a/docs/html/guide/topics/data/backup.jd
+++ b/docs/html/guide/topics/data/backup.jd
@@ -124,7 +124,7 @@
 in order to store your data on their servers.</li>
   <li>Define a backup agent by either:</p>
     <ol type="a">
-      <li><a href="#backupAgent">Extending BackupAgent</a>
+      <li><a href="#BackupAgent">Extending BackupAgent</a>
         <p>The {@link android.app.backup.BackupAgent} class provides the central interface with
 which your application communicates with the Backup Manager. If you extend this class
 directly, you must override {@link
@@ -133,7 +133,7 @@
 android.app.backup.BackupAgent#onRestore(BackupDataInput,int,ParcelFileDescriptor)
 onRestore()} to handle the backup and restore operations for your data.</p>
         <p><em>Or</em></p>
-      <li><a href="#backupAgentHelper">Extending BackupAgentHelper</a>
+      <li><a href="#BackupAgentHelper">Extending BackupAgentHelper</a>
         <p>The {@link android.app.backup.BackupAgentHelper} class provides a convenient
 wrapper around the {@link android.app.backup.BackupAgent} class, which minimizes the amount of code
 you need to write. In your {@link android.app.backup.BackupAgentHelper}, you must use one or more
@@ -278,7 +278,7 @@
   <dt>{@link
 android.app.backup.BackupAgent#onBackup(ParcelFileDescriptor,BackupDataOutput,ParcelFileDescriptor)
 onBackup()}</dt>
-    <dd>The Backup Manager calls this method after you <a href="#RequestBackup">request a
+    <dd>The Backup Manager calls this method after you <a href="#RequestingBackup">request a
 backup</a>. In this method, you read your application data from the device and pass the data you
 want to back up to the Backup Manager, as described below in <a href="#PerformingBackup">Performing
 backup</a>.</dd>
@@ -287,8 +287,8 @@
 android.app.backup.BackupAgent#onRestore(BackupDataInput,int,ParcelFileDescriptor)
 onRestore()}</dt>
     <dd>The Backup Manager calls this method during a restore operation (you can <a
-href="#RequestRestore">request a restore</a>, but the system automatically performs restore when the
-user re-installs your application). When it calls this method, the Backup Manager delivers your
+href="#RequestingRestore">request a restore</a>, but the system automatically performs restore when
+the user re-installs your application). When it calls this method, the Backup Manager delivers your
 backup data, which you then restore to the device, as described below in <a
 href="#PerformingRestore">Performing restore</a>.</dd>
 </dl>
diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd
index 92771a8..be1b0fc 100644
--- a/docs/html/guide/topics/graphics/index.jd
+++ b/docs/html/guide/topics/graphics/index.jd
@@ -31,8 +31,8 @@
 and which tasks they're best suited for.</p>
 
 <p>If you're specifically looking for information on drawing 3D graphics, this page won't
-help a lot. However, the information below, on <a href="#drawing-with-canvas">Drawing with a Canvas</a>
-(and the section on SurfaceView), 
+help a lot. However, the information below about how to <a href="#draw-with-canvas">Draw with a
+Canvas</a> (and the section on SurfaceView), 
 will give you a quick idea of how you should draw to the View hierarchy. For more information
 on Android's 3D graphic utilities (provided by the OpenGL ES API), 
 read <a href="opengl.html">3D with OpenGL</a> and refer to other OpenGL documentation.</p>
diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd
index 558d453..8e18754 100644
--- a/docs/html/guide/topics/media/index.jd
+++ b/docs/html/guide/topics/media/index.jd
@@ -14,7 +14,7 @@
 
 <h2>In this document</h2>
 <ol>
-<li><a href="#playback.html">Audio and Video Playback</a>
+<li><a href="#playback">Audio and Video Playback</a>
     <ol>
       <li><a href="#playraw">Playing from a Raw Resource</li>
       <li><a href="#playfile">Playing from a File or Stream</li>
@@ -63,7 +63,7 @@
 see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media
 Formats</a> appendix. </p>
 
-<h2 id="play">Audio and Video Playback</h2>
+<h2 id="playback">Audio and Video Playback</h2>
 <p>Media can be played from anywhere: from a raw resource, from a file from the system, 
 or from an available network (URL).</p>
   
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd
index 9ebed56..79ce669 100644
--- a/docs/html/guide/topics/resources/drawable-resource.jd
+++ b/docs/html/guide/topics/resources/drawable-resource.jd
@@ -381,7 +381,7 @@
 <dd>
 <pre class="stx">
 &lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;<a href="#bitmap-element">nine-patch</a>
+&lt;<a href="#ninepatch-element">nine-patch</a>
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@[package:]drawable/<em>drawable_resource</em>"
     android:dither=["true" | "false"] /&gt;
@@ -394,8 +394,8 @@
 <dd>
 <dl class="tag-list">
 
-  <dt id="layerlist-element"><code>&lt;bitmap&gt;</code></dt>
-    <dd>Defines the bitmap source and its properties.
+  <dt id="ninepatch-element"><code>&lt;nine-patch&gt;</code></dt>
+    <dd>Defines the Nine-Patch source and its properties.
       <p class="caps">attributes:</p>
       <dl class="atn-list">
         <dt><code>xmlns:android</code></dt>
@@ -1613,7 +1613,7 @@
 href="more-resources.html#Dimension">dimension resource</a>.</dd>
       </dl>
     </dd>
-  <dt id="solid-element"><code>&lt;size&gt;</code></dt>
+  <dt id="size-element"><code>&lt;size&gt;</code></dt>
     <dd>The size of the shape.
       <p class="caps">attributes:</p>
       <dl class="atn-list">
diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd
index 6cae1eb..5f4d5c2 100644
--- a/docs/html/guide/topics/resources/more-resources.jd
+++ b/docs/html/guide/topics/resources/more-resources.jd
@@ -369,11 +369,11 @@
 <dd>
 <dl class="tag-list">
 
-  <dt id="integer-resources-element"><code>&lt;resources&gt;</code></dt>
+  <dt id="id-resources-element"><code>&lt;resources&gt;</code></dt>
     <dd><strong>Required.</strong> This must be the root node.
       <p>No attributes.</p>
     </dd>
-  <dt id="integer-element"><code>&lt;integer&gt;</code></dt>
+  <dt id="id-item-element"><code>&lt;item&gt;</code></dt>
     <dd>Defines a unique ID. Takes no value, only attributes.
       <p class="caps">attributes:</p>
       <dl class="atn-list">
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index 4f3b0da..5d00db1 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -749,7 +749,7 @@
 
 <p>For example, if your application supports several languages, always include a {@code
 values/} directory (in which your strings are saved) <em>without</em> a <a
-href="#LocalQualifier">language and region qualifier</a>. If you instead put all your string files
+href="#LocaleQualifier">language and region qualifier</a>. If you instead put all your string files
 in directories that have a language and region qualifier, then your application will crash when run
 on a device set to a language that your strings do not support. But, as long as you provide default
 {@code values/} resources, then your application will run properly (even if the user doesn't
diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd
index d75ff4d..e685c9b 100644
--- a/docs/html/guide/topics/resources/runtime-changes.jd
+++ b/docs/html/guide/topics/resources/runtime-changes.jd
@@ -51,7 +51,7 @@
 situation, you have two options:</p>
 
 <ol type="a">
-  <li><a href="#RetainAnObject">Retain an object during a configuration change</a>
+  <li><a href="#RetainingAnObject">Retain an object during a configuration change</a>
   <p>Allow your Activity to restart when a configuration changes, but carry a stateful
 {@link java.lang.Object} to the new instance of your Activity.</p>
 
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 49938b4..ea8dc1c 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -461,7 +461,7 @@
 }
 </pre>
 
-<p>Compared to the example code in the section about <a href="#PerfomingSearch">Performing a
+<p>Compared to the example code in the section about <a href="#PerformingSearch">Performing a
 Search</a>, all the code to handle the
 search Intent is now in the {@code handleIntent()} method, so that both {@link
 android.app.Activity#onCreate(Bundle)
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index fe641a2..f95a89b 100644
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -16,8 +16,7 @@
       </ol>
     </li>
     <li><a href="#Position">Position</a></li>
-    <li><a href="#SizePaddingMargin">Size, Padding and Margins</a></li>
-    <li><a href="#example">Example Layout</a></li>
+    <li><a href="#SizePaddingMargins">Size, Padding and Margins</a></li>
   </ol>
 
   <h2>Key classes</h2>
diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd
index b4e467c..42790b6 100644
--- a/docs/html/guide/topics/ui/menus.jd
+++ b/docs/html/guide/topics/ui/menus.jd
@@ -515,7 +515,7 @@
 Checkable menu items are intended to be used only on a per-session basis and not saved after the
 application is destroyed. If you have application settings that you would like to save for the user,
 you should store the data using <a
-href="#{@docRoot}guide/topics/data/data-storage.html#pref">Shared Preferences</a>.</p>
+href="{@docRoot}guide/topics/data/data-storage.html#pref">Shared Preferences</a>.</p>
 
 
 <h3 id="shortcuts">Shortcut keys</h3>
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index 98b6e7d..b3c76871 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -432,7 +432,7 @@
 {@link android.bluetooth.BluetoothSocket} on the same RFCOMM channel. At this
 point, each device can obtain input and output streams and data transfer can
 begin, which is discussed in the section about <a
-href="#ManagingConnection">Managing a Connection</a>. This section describes how
+href="#ManagingAConnection">Managing a Connection</a>. This section describes how
 to initiate the connection between two devices.</p>
 
 <p>The server device and the client device each obtain the required {@link
@@ -603,7 +603,7 @@
 <p><code>manageConnectedSocket()</code> is a fictional method in the application
 that will
 initiate the thread for transferring data, which is discussed in the section
-about <a href="#ManagingConnection">Managing a Connection</a>.</p>
+about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
 
 <p>You should usually close your {@link android.bluetooth.BluetoothServerSocket}
 as soon as you are done listening for incoming connections. In this example, {@link
@@ -724,7 +724,7 @@
 
 <p><code>manageConnectedSocket()</code> is a fictional method in the application
 that will initiate the thread for transferring data, which is discussed in the section
-about <a href="#ManagingConnection">Managing a Connection</a>.</p>
+about <a href="#ManagingAConnection">Managing a Connection</a>.</p>
 
 <p>When you're done with your {@link android.bluetooth.BluetoothSocket}, always
 call {@link android.bluetooth.BluetoothSocket#close()} to clean up.
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index a50979d..cc0260a 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -496,7 +496,7 @@
 </tr>
 </table>
 
-<h3 id="preparing">Configuring the ADT Plugin</h3>
+<h3 id="configuring">Configuring the ADT Plugin</h3>
 
 <p>Once you've successfully downloaded ADT as described above, the next step
 is to modify your ADT preferences in Eclipse to point to the Android SDK directory:</p>
diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd
index 4cb1bb2..488382e 100644
--- a/docs/html/sdk/installing.jd
+++ b/docs/html/sdk/installing.jd
@@ -54,7 +54,7 @@
     <li><a href="#Preparing">1. Preparing Your Development Computer</a></li>
     <li><a href="#Installing">2. Downloading the SDK Starter Package</a></li>
     <li><a href="#InstallingADT">3. Installing the ADT Plugin for Eclipse</a></li>
-    <li><a href="#components">4. Adding Platforms and Other Components</a>
+    <li><a href="#AddingComponents">4. Adding Platforms and Other Components</a>
       <ol>
         <li><a href="#components">Available Components</a></li>
         <li><a href="#which">Recommended Components</a></li>
@@ -153,7 +153,7 @@
 
 
 
-<h2 id="components">Step 4. Adding Android Platforms and Other Components</h2>
+<h2 id="AddingComponents">Step 4. Adding Platforms and Other Components</h2>
 
 <p>The last step in setting up your SDK is using the <em>Android SDK and AVD Manager</em> (a
 tool included in the SDK starter package) to download
diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd
index 8ea7088..bb0dde6 100644
--- a/docs/html/sdk/win-usb.jd
+++ b/docs/html/sdk/win-usb.jd
@@ -179,7 +179,7 @@
   <li><strong>Windows Vista:</strong>
     <ol class="nolist">
       <li><a href="#VistaFreshInstall">Perform a fresh installation</a></li>
-      <li><a href="#VistaUprade">Upgrade an existing driver</a></li>
+      <li><a href="#VistaUpgrade">Upgrade an existing driver</a></li>
     </ol>
   </li>
   <li><strong>Windows XP:</strong>