10 files changed, 17 insertions, 26 deletions
diff --git a/docs/html/guide/appendix/install-location.jd b/docs/html/guide/appendix/install-location.jd
index 77cebc6..be89caf 100644
--- a/docs/html/guide/appendix/install-location.jd
+++ b/docs/html/guide/appendix/install-location.jd
@@ -94,7 +94,7 @@ Level 8:</p>
 <ol>
   <li>Include the {@code android:installLocation} attribute with a value of "{@code auto}" or
 "{@code preferExternal}" in the <code><a
-href="{@docRoog}guide/topics/manifest/uses-sdk-element.html">&lt;manifest&gt;</a></code>
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;manifest&gt;</a></code>
 element.</li>
   <li>Leave your {@code android:minSdkVersion} attribute as is (something <em>less
 than</em> "8") and be certain that your application code uses only APIs compatible with that
diff --git a/docs/html/guide/appendix/market-filters.jd b/docs/html/guide/appendix/market-filters.jd
index 0b1afae..201a142 100644
--- a/docs/html/guide/appendix/market-filters.jd
+++ b/docs/html/guide/appendix/market-filters.jd
@@ -126,7 +126,7 @@ devices that have normal or large screens. </p>
 
 <p>This behavior is especially significant for applications that set their
 <code><a
-href="@docRoot}guide/topics/manifest/uses-sdk-element.html">android:
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">android:
 minSdkVersion</a></code> to 3 or lower, since Market will filter them from
 small-screen devices by default. Such applications can enable support for
 small-screen devices by adding a <code>android:targetSdkVersion="4"</code>
@@ -164,7 +164,7 @@ of corresponding screen size.</li>
     <p>For more information on how to declare support for screen sizes in your
     application, see <code><a
     href="{@docRoot}guide/topics/manifest/supports-screens-element.html">&lt;supports-screens&gt;</a></code>
-    and <a href="{@docRoot}guide/practices/screens-support.html">Supporting Multiple
+    and <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple
     Screens</a>.</p>
 </td>
   </tr>
diff --git a/docs/html/guide/topics/resources/accessing-resources.jd b/docs/html/guide/topics/resources/accessing-resources.jd
index cf8970c..03bb939 100644
--- a/docs/html/guide/topics/resources/accessing-resources.jd
+++ b/docs/html/guide/topics/resources/accessing-resources.jd
@@ -136,7 +136,7 @@ required when referencing resources from your own package).</li>
 without the extension or the {@code android:name} attribute value in the XML element (for simple
 values).</li>
 </ul>
-<p>See <a href="resource-types.html">Resource Types</a> for
+<p>See <a href="available-resources.html">Resource Types</a> for
 more information about each resource type and how to reference them.</p>
 
 
@@ -219,7 +219,7 @@ without the extension or the {@code android:name} attribute value in the XML ele
 values).</li>
 </ul>
 
-<p>See <a href="resource-types.html">Resource Types</a> for
+<p>See <a href="available-resources.html">Resource Types</a> for
 more information about each resource type and how to reference them.</p>
 
 
diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 2c51d54..0688a18 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -97,7 +97,8 @@ or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> bel
       {@link android.view.ViewGroup}. For a reference of all available attributes,
       see the corresponding reference documentation for the {@link android.view.ViewGroup} class
 (for example, the <a
-      href="{@docRoot}reference/android/widget/LinearLayout#lattrs">LinearLayout XML attributes</a>).</p>
+      href="{@docRoot}reference/android/widget/LinearLayout.html#lattrs">LinearLayout XML
+attributes</a>).</p>
     </dd>
   <dt id="view-element"><code>&lt;View&gt;</code></dt>
     <dd>An individual UI component, generally referred to as a "widget". Different
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd
index e76a92c..3d630c9 100755
--- a/docs/html/guide/topics/resources/localization.jd
+++ b/docs/html/guide/topics/resources/localization.jd
@@ -317,11 +317,11 @@ will prefer an MCC match over a language match. </p>
 
 <p>The selection process is not always as straightforward as these examples
 suggest. Please read  <a
-href="{@docRoot}guide/topics/resources/creating-resources.html#BestMatch">How Android Finds
+href="{@docRoot}guide/topics/resources/providing-resources.html#BestMatch">How Android Finds
 the Best-matching Resource</a> for a more nuanced description of the
 process. All the qualifiers are described and listed in order of
 precedence in <a
-href="{@docRoot}guide/topics/resources/creating-resources.html#table2">Table 2 of Providing
+href="{@docRoot}guide/topics/resources/providing-resources.html#table2">Table 2 of Providing
 Alternative Resources</a>.</p>
 
 <h3 id="referring-to-resources">Referring to Resources in Java</h3>
@@ -330,7 +330,7 @@ Alternative Resources</a>.</p>
 <code>R.<em>resource_type</em>.<em>resource_name</em></code> or
 <code>android.R.<em>resource_type</em>.<em>resource_name</em></code><em>.</em>
 For more about this, see <a
-href="{@docRoot}guide/topics/resources/using-resources.html">Accessing Resources</a>.</p>
+href="{@docRoot}guide/topics/resources/accessing-resources.html">Accessing Resources</a>.</p>
 
 <h2 id="strategies">Localization Strategies</h2>
 
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 718668c..a5f99c7 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -275,8 +275,8 @@ application to see a complete SQLite implementation that performs searches with
     <li>If your data is stored online, then the perceived search performance may be
 inhibited by the user's data connection. You may want to display a spinning progress wheel until
 your search returns. See {@link android.net} for a reference of network APIs and <a
-href="guide/topics/ui/dialogs.html#ProgressDialog">Creating a Progress Dialog</a> to see how
-you can display a progress wheel.</li>
+href="{@docRoot}guide/topics/ui/dialogs.html#ProgressDialog">Creating a Progress Dialog</a> to see
+how you can display a progress wheel.</li>
   </ul>
 
 
diff --git a/docs/html/index.jd b/docs/html/index.jd
index bb76d28..230dd4e 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -177,15 +177,6 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
       'img':"maps-large.png",
       'title':"Maps API Key",
       'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='http://code.google.com/android/add-ons/google-apis/maps-overview.html'>Learn more &raquo;</a></p>"
-    },
-
-    'io': {
-      'layout':"imgLeft",
-      'icon':"io-small.png",
-      'name':"Google I/O '09'",
-      'img':"io-large.png",
-      'title':"2009 Google I/O Developer Conference",
-      'desc': "<p>The 2009 Google I/O developer conference took place May 27-28, 2009, in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
     }
 
   }
diff --git a/docs/html/resources/articles/live-wallpapers.jd b/docs/html/resources/articles/live-wallpapers.jd
index 3e4bc0c..ea67fed 100644
--- a/docs/html/resources/articles/live-wallpapers.jd
+++ b/docs/html/resources/articles/live-wallpapers.jd
@@ -36,8 +36,8 @@ href="../samples/CubeLiveWallpaper/index.html">CubeLiveWallpaper sample code</a>
 <p>In terms of implementation, a live wallpaper is very similar to a regular
 Android <a href="../../../reference/android/app/Service.html">service</a>. The
 only difference is the addition of a new method, <a
-href="../../../reference/android/service/wallpaper/WallpaperService.
-html#onCreateEngine()"><code>onCreateEngine()</code></a>, whose goal is to create a <a
+href="../../../reference/android/service/wallpaper/WallpaperService.html#onCreateEngine()">{@code
+onCreateEngine()}</a>, whose goal is to create a <a
 href="../../../reference/android/service/wallpaper/WallpaperService.Engine.html">
 <code>WallpaperService.Engine</code></a>. The engine is responsible for
 handling the lifecycle and drawing of a wallpaper. The system provides a surface
diff --git a/docs/html/resources/articles/speech-input.jd b/docs/html/resources/articles/speech-input.jd
index 8e41d34..282b619 100644
--- a/docs/html/resources/articles/speech-input.jd
+++ b/docs/html/resources/articles/speech-input.jd
@@ -29,9 +29,8 @@ Handcent SMS:</p>
 
 <p> The Android SDK makes it easy to integrate speech input directly into your
 own application. Just copy and paste from this <a
-href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/
-VoiceRecognition.html">
-sample application</a> to get
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/VoiceRecognition.html">sample
+application</a> to get
 started. The sample application first verifies that the target device is able
 to recognize speech input:</p> 
 <pre>
diff --git a/docs/html/sdk/android-2.2.jd b/docs/html/sdk/android-2.2.jd
index cfcb7a7..5844256 100644
--- a/docs/html/sdk/android-2.2.jd
+++ b/docs/html/sdk/android-2.2.jd
@@ -351,7 +351,7 @@ and {@link android.app.backup.BackupAgent#onRestore(android.app.backup.BackupDat
 A simple implementation of a BackupAgent useful for backing up preferences 
 and files is available by using {@link android.app.backup.BackupAgentHelper}.
 For more information, see <a
-href="{@docRoot}guide/topics/topics/data/data-backup.html">Data Backup</a>.</p>
+href="{@docRoot}guide/topics/topics/data/backup.html">Data Backup</a>.</p>
 
 <h4>Graphics</h4>