diff --git a/docs/html/guide/developing/projects/projects-cmdline.jd b/docs/html/guide/developing/projects/projects-cmdline.jd
index 08e0d9a..81c2c58 100644
--- a/docs/html/guide/developing/projects/projects-cmdline.jd
+++ b/docs/html/guide/developing/projects/projects-cmdline.jd
@@ -114,7 +114,7 @@
   <p class="caution"><strong>Caution:</strong> You should refrain from moving the location of the
   SDK directory, because this will break the SDK location property located in <code>local.properties</code>.
   If you need to update the SDK location, use the <code>android update project</code> command.
-  See <a href="UpdatingAProject">Updating a Project</a> for more information.</p>
+  See <a href="#UpdatingAProject">Updating a Project</a> for more information.</p>
 
   <h2 id="UpdatingAProject">Updating a Project</h2>
 
diff --git a/docs/html/guide/practices/optimizing-for-3.0.jd b/docs/html/guide/practices/optimizing-for-3.0.jd
index e968372..a24dba8f 100644
--- a/docs/html/guide/practices/optimizing-for-3.0.jd
+++ b/docs/html/guide/practices/optimizing-for-3.0.jd
@@ -411,8 +411,8 @@
 >Action Bar</a>: Samples that demonstrate various Action Bar features, such as tabs, logos, and
 action items.</li>
   <li><a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.
-html">Clipboard</a>: An example of how to use the clipboard for copy and paste operations.</li>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/content/ClipboardSample.html"
+>Clipboard</a>: An example of how to use the clipboard for copy and paste operations.</li>
   <li><a
 href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/DragAndDropDemo.html">
 Drag and Drop</a>: An example of how to perform drag and drop with new View events.</li>
@@ -427,11 +427,11 @@
 Property Animation</a>: Several samples using the new animation APIs to animate object
 properties.</li>
   <li><a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.
-html">Search View Widget</a>: Example using the new search widget in the Action Bar (as an
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.html">
+Search View Widget</a>: Example using the new search widget in the Action Bar (as an
 "action view").</li>
   <li><a
-href="{@docRoot}resources/samples/Renderscript/index.html">Renderscript</a>: Contains several
+href="{@docRoot}resources/samples/RenderScript/index.html">Renderscript</a>: Contains several
 different applications that demonstrate using renderscript APIs for computations and 3D
 graphics.</li>
 </ul>
diff --git a/docs/html/guide/practices/screen-compat-mode.jd b/docs/html/guide/practices/screen-compat-mode.jd
index 6a77d60..7f10914 100644
--- a/docs/html/guide/practices/screen-compat-mode.jd
+++ b/docs/html/guide/practices/screen-compat-mode.jd
@@ -71,7 +71,7 @@
 android:minSdkVersion}</a> or <a
 href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
 android:targetSdkVersion}</a> to {@code "4"} or higher, or set <a
-href="guide/topics/manifest/supports-screens-element.html#resizeable">{@code
+href="{@docRoot}guide/topics/manifest/supports-screens-element.html#resizeable">{@code
 android:resizeable}</a> to {@code "true"}.</p>
   </dd>
   
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 6dec4b3..0c3c7d3 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -1111,7 +1111,7 @@
 <img src="{@docRoot}images/screens_support/scale-test.png" alt="" />
 <p class="img-caption"><strong>Figure 5.</strong> Comparison of pre-scaled and auto-scaled
 bitmaps, from <a
-href="resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">
 ApiDemos</a>.
 </p>
 </div>
@@ -1150,7 +1150,7 @@
 scaled bitmaps have slightly different appearances depending on whether they are pre-scaled or
 auto-scaled at draw time. You can find the source code for this sample application, which
 demonstrates using pre-scaled and auto-scaled bitmaps, in <a
-href="resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html">
 ApiDemos</a>.</p>
 
 <p class="note"><strong>Note:</strong> In Android 3.0 and above, there should be no perceivable
diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd
index 7dddd9a..7bbf5e6 100644
--- a/docs/html/guide/topics/admin/device-admin.jd
+++ b/docs/html/guide/topics/admin/device-admin.jd
@@ -619,8 +619,8 @@
 mDPM.setPasswordExpirationTimeout(mDeviceAdminSample, pwExpiration);
 </pre>
 
-<p>From the <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/
-DeviceAdminSample.html"> Device Administration API sample</a>, here is the code
+<p>From the <a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.html"
+>Device Administration API sample</a>, here is the code
 that updates the password expiration status:</p>
 
 <pre>
diff --git a/docs/html/guide/topics/fundamentals/loaders.jd b/docs/html/guide/topics/fundamentals/loaders.jd
index d31f090..3aad204 100644
--- a/docs/html/guide/topics/fundamentals/loaders.jd
+++ b/docs/html/guide/topics/fundamentals/loaders.jd
@@ -32,7 +32,8 @@
     <h2>Related samples</h2>
    <ol>
      <li> <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.html">FragmentListCursorLoader</a></li>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
+LoaderCursor</a></li>
      <li> <a
 href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html">
 LoaderThrottle</a></li>
@@ -485,7 +486,9 @@
 <p>There are a few different samples in <strong>ApiDemos</strong> that
 illustrate how to use loaders:</p>
 <ul>
-  <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/FragmentListCursorLoader.html">FragmentListCursorLoader</a> &#8212; A complete version of the
+  <li><a
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
+LoaderCursor</a> &#8212; A complete version of the
 snippet shown above.</li>
   <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.html"> LoaderThrottle</a> &#8212; An example of how to use throttling to
 reduce the number of queries a content provider does then its data changes.</li>
diff --git a/docs/html/guide/topics/graphics/2d-graphics.jd b/docs/html/guide/topics/graphics/2d-graphics.jd
index ac2b47c..5abffb3 100644
--- a/docs/html/guide/topics/graphics/2d-graphics.jd
+++ b/docs/html/guide/topics/graphics/2d-graphics.jd
@@ -188,7 +188,7 @@
 
 <p>This document discusses the basics of using Drawable objects to draw graphics and how to use a
 couple subclasses of the Drawable class. For information on using Drawables to do frame-by-frame
-animation, see <a href="{@docRoot}guide/topics/animation/frame-animation.html">Frame-by-Frame
+animation, see <a href="{@docRoot}guide/topics/animation/drawable-animation.html">Drawable
 Animation</a>.</p>
 
 <p>A {@link android.graphics.drawable.Drawable} is a general abstraction for "something that can be
diff --git a/docs/html/guide/topics/graphics/animation.jd b/docs/html/guide/topics/graphics/animation.jd
index e8996f6..561369d 100644
--- a/docs/html/guide/topics/graphics/animation.jd
+++ b/docs/html/guide/topics/graphics/animation.jd
@@ -6,7 +6,8 @@
 
       <h2>See also</h2>
       <ol>
-        <li><a href="{@docRoot}guide/topics/graphics/property-animation.html">Property Animation</a></li>
+        <li><a href="{@docRoot}guide/topics/graphics/prop-animation.html">Property
+Animation</a></li>
         <li><a href="{@docRoot}guide/topics/graphics/view-animation.html">View Animation</a></li>
         <li><a href="{@docRoot}guide/topics/graphics/drawable-animation.html">Drawable Animation</a></li>
       <ol>
diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd
index ffa9a39..ab623c2 100644
--- a/docs/html/guide/topics/graphics/index.jd
+++ b/docs/html/guide/topics/graphics/index.jd
@@ -5,7 +5,7 @@
   <div id="qv">
   <h2>Topics</h2>
   <ol>
-    <li><a href="{@docRoot}guide/topics/graphics/canvas.html">Canvas and Drawables</a></li>
+    <li><a href="{@docRoot}guide/topics/graphics/2d-graphics.html">Canvas and Drawables</a></li>
     <li><a href="{@docRoot}guide/topics/graphics/hardware-accel.html">Hardware Acceleration</a></li>
     <li><a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a></li>
   </ol>
diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd
index 231f4ef..6a2a20f 100644
--- a/docs/html/guide/topics/graphics/opengl.jd
+++ b/docs/html/guide/topics/graphics/opengl.jd
@@ -40,14 +40,11 @@
     </ol>
     <h2>Related samples</h2>
     <ol>
-      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/
-GLSurfaceViewActivity.html">GLSurfaceViewActivity</a></li>
-      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/
-GLES20Activity.html">GLES20Activity</a></li>
-      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/
-TouchRotateActivity.html">TouchRotateActivity</a></li>
-      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/
-CompressedTextureActivity.html">Compressed Textures</a></li>
+      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">GLSurfaceViewActivity</a></li>
+      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.html">GLES20Activity</a></li>
+      <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.html">TouchRotateActivity</a></li>
+      <li><a
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/CompressedTextureActivity.html">Compressed Textures</a></li>
     </ol>
     <h2>See also</h2>
     <ol>
@@ -94,8 +91,8 @@
     implement the touch listeners, as shown in OpenGL Tutorials for
     <a href="{@docRoot}resources/tutorials/opengl/opengl-es10.html#touch">ES 1.0</a>,
     <a href="{@docRoot}resources/tutorials/opengl/opengl-es20.html#touch">ES 2.0</a> and the <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity
-.html">TouchRotateActivity</a> sample.</dd>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.html"
+>TouchRotateActivity</a> sample.</dd>
 
   <dt><strong>{@link android.opengl.GLSurfaceView.Renderer}</strong></dt>
   <dd>This interface defines the methods required for drawing graphics in an OpenGL {@link
@@ -410,9 +407,8 @@
 android.opengl.ETC1Util} utility class and the {@code etc1tool} compression tool (located in the
 Android SDK at {@code &lt;sdk&gt;/tools/}). For an example of an Android application that uses
 texture compression, see the <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/
-CompressedTextureActivity.html">CompressedTextureActivity</a> code sample.
-</p>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/CompressedTextureActivity.html"
+>CompressedTextureActivity</a> code sample.</p>
 
 <p>To check if the ETC1 format is supported on a device, call the {@link
 android.opengl.ETC1Util#isETC1Supported() ETC1Util.isETC1Supported()} method.</p>
diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd
index e4c2283..8f08f59 100644
--- a/docs/html/guide/topics/renderscript/compute.jd
+++ b/docs/html/guide/topics/renderscript/compute.jd
@@ -1,6 +1,6 @@
 page.title=Compute
 parent.title=RenderScript
-parent.link=index.html 
+parent.link=index.html
 @jd:body
 
   <div id="qv-wrapper">
diff --git a/docs/html/guide/topics/renderscript/graphics.jd b/docs/html/guide/topics/renderscript/graphics.jd
index d8be85f..3ea3f85 100644
--- a/docs/html/guide/topics/renderscript/graphics.jd
+++ b/docs/html/guide/topics/renderscript/graphics.jd
@@ -22,13 +22,13 @@
       <ol>
         <li><a href="{@docRoot}resources/samples/RenderScript/Balls/index.html">Balls</a></li>
 
-        <li><a href=
-        "{@docRoot}resources/samples/Renderscript/Fountain/index.html">Fountain</a></li>
+        <li><a href="{@docRoot}resources/samples/RenderScript/Fountain/index.html">Fountain</a></li>
 
         <li><a href="{@docRoot}resources/samples/RenderScript/HelloWorld/index.html">Hello
         World</a></li>
 
-        <li><a href="{@docRoot}resources/samples/RenderScript/Samples/index.html">Samples</a></li>
+        <li><a
+href="{@docRoot}resources/samples/RenderScript/MiscSamples/index.html">Misc Samples</a></li>
       </ol>
     </div>
   </div>
diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd
index 480ca78..eaa698f 100644
--- a/docs/html/guide/topics/resources/animation-resource.jd
+++ b/docs/html/guide/topics/resources/animation-resource.jd
@@ -10,8 +10,8 @@
       <li><a href="#Property">Property Animation</a></li>
       <li><a href="#View">View Animation</a>
         <ol>
-          <li><a href="Tween">Tween animation</a></li>
-          <li><a href="Frame">Frame animation</a></li>
+          <li><a href="#Tween">Tween animation</a></li>
+          <li><a href="#Frame">Frame animation</a></li>
         </ol>      
       </li>
     </ol>
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 27409d5..e06563d 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -807,8 +807,8 @@
 Bar</a> developer guide.</p>
 
 <p>Also see the <a
-href="{@docRoot}resources/samples/SearchableDictionary/src/com/example/android/searchabledict/
-SearchableDictionary.html">Searchable Dictionary</a> for an example implementation using
+href="{@docRoot}resources/samples/SearchableDictionary/src/com/example/android/searchabledict/SearchableDictionary.html"
+>Searchable Dictionary</a> for an example implementation using
 both the dialog and the widget.</p>
 
 
diff --git a/docs/html/guide/topics/usb/adk.jd b/docs/html/guide/topics/usb/adk.jd
index 120576b..6c7ab0d 100644
--- a/docs/html/guide/topics/usb/adk.jd
+++ b/docs/html/guide/topics/usb/adk.jd
@@ -396,7 +396,7 @@
 
     <li>Connect the ADK board (USB-A) to your Android-powered device (micro-USB). Ensure that the
     power cable to the accessory is plugged in or that the micro-USB port on the accesory is
-    connected to your computer for power (this also allows you to <a href="monitoring">monitor the
+    connected to your computer for power (this also allows you to <a href="#monitoring">monitor the
     ADK board</a>). When connected, accept the prompt that asks for whether or not to open the
     DemoKit application to connect to the accessory. If the prompt does not show up, connect and
     reconnect the accessory.</li>
@@ -625,8 +625,8 @@
   <code>AndroidAccessory::isAccessoryDevice()</code>. This method checks the vendor and product ID
   of the device descriptor. A device in accessory mode has a vendor ID of 0x18D1 and a product ID
   of 0x2D00 or 0x2D01. If the device is in accessory mode, then the ADK board can <a href=
-  "#establish-a">establish communication with the device</a>. If not, the board <a href=
-  "start-a">attempts to start the device in accessory mode</a>.</p>
+  "#establish">establish communication with the device</a>. If not, the board <a href=
+  "#start">attempts to start the device in accessory mode</a>.</p>
   <pre>
 bool AndroidAccessory::isConnected(void)
 {
@@ -699,7 +699,7 @@
 </pre>If this method returns false, the board waits until a new device is connected. If it is
 successful, the device displays itself on the USB bus as being in accessory mode when the ADK board
 re-enumerates the bus. When the device is in accessory mode, the accessory then <a href=
-"establish-a">establishes communication with the device</a>.
+"establish-adk">establishes communication with the device</a>.
 
   <h3 id="establish-adk">Establish communication with the device</h3>
 
diff --git a/docs/html/guide/topics/usb/index.jd b/docs/html/guide/topics/usb/index.jd
index 6dc8ec5..ef53bdf 100644
--- a/docs/html/guide/topics/usb/index.jd
+++ b/docs/html/guide/topics/usb/index.jd
@@ -42,8 +42,8 @@
   dependant on the device's hardware, regardless of platform level. You can filter for devices that
   support USB host and accessory through a <a href=
   "{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a> element. See
-  the USB <a href="{@docRoot}guide/topics/USB/accessory.html">accessory</a> and <a href=
-  "{@docRoot}guide/topics/USB/host.html">host</a> documentation for more details.</p>
+  the USB <a href="{@docRoot}guide/topics/usb/accessory.html">accessory</a> and <a href=
+  "{@docRoot}guide/topics/usb/host.html">host</a> documentation for more details.</p>
 
   <h2>Debugging considerations</h2>
 
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd
index ade3d8b..4580986 100644
--- a/docs/html/sdk/android-4.0.jd
+++ b/docs/html/sdk/android-4.0.jd
@@ -1196,8 +1196,10 @@
 allows you to enable “split action bar" so that more action items can appear on the screen in a
 separate bar at the bottom of the screen. To enable split action bar, add {@link
 android.R.attr#uiOptions android:uiOptions} with {@code "splitActionBarWhenNarrow"} to either your
-<a href="guide/topics/manifest/application-element.html">{@code &lt;application&gt;}</a> tag or
-individual <a href="guide/topics/manifest/activity-element.html">{@code &lt;activity&gt;}</a> tags
+<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code &lt;application&gt;}</a>
+tag or
+individual <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code
+&lt;activity&gt;}</a> tags
 in your manifest file. When enabled, the system will add an additional bar at the bottom of the
 screen for all action items when the screen is narrow (no action items will appear in the primary
 action bar).</p>
@@ -1267,9 +1269,8 @@
 </pre>
 
 <p>For an example using the {@link android.widget.ShareActionProvider}, see the <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/
-ActionBarActionProviderActivity.html">ActionBarActionProviderActivity</a>
-class in ApiDemos.</p>
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarActionProviderActivity.html"
+>ActionBarActionProviderActivity</a> class in ApiDemos.</p>
 
 
 <h4>Collapsible action views</h4>
@@ -1530,7 +1531,7 @@
 provide a different background drawable when a cursor hovers over the view.</p>
 
 <p>For a demonstration of the new hover events, see the <a
-href="{@docRoot}samples/ApiDemos/src/com/example/android/apis/view/Hover.html">Hover</a> class in
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/Hover.html">Hover</a> class in
 ApiDemos.</p>
 
 
@@ -1571,7 +1572,7 @@
 android.view.MotionEvent#AXIS_ORIENTATION}.</p>
 
 <p>For a demonstration of tool types, button states and the new axis codes, see the <a
-href="{@docRoot}samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.html">TouchPaint
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.html">TouchPaint
 </a> class in ApiDemos.</p>
 
 
@@ -1773,7 +1774,7 @@
 object (View, Drawable, Fragment, Object, or anything else) and define animation aspects such
 as duration, interpolation, repeat and more. The new framework makes Animations in Android
 simpler than ever. See the
-<a href="{@docRoot}guide/topics/graphics/property-animation.html">Property Animation</a> developer
+<a href="{@docRoot}guide/topics/graphics/prop-animation.html">Property Animation</a> developer
 guide.</li>
       <li>RenderScript graphics and compute engine: RenderScript offers a high performance 3D
 graphics rendering and compute API at the native level, which you write in the C (C99 standard),