diff --git a/samples/CubeLiveWallpaper/_index.html b/samples/CubeLiveWallpaper/_index.html
index f6aa931..a429215 100644
--- a/samples/CubeLiveWallpaper/_index.html
+++ b/samples/CubeLiveWallpaper/_index.html
@@ -4,8 +4,8 @@
 <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
+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.Engine.html">
 <code>WallpaperService.Engine</code></a>. The engine is responsible for
diff --git a/samples/SearchableDictionary/_index.html b/samples/SearchableDictionary/_index.html
index 4f753e6..ce3ec54 100644
--- a/samples/SearchableDictionary/_index.html
+++ b/samples/SearchableDictionary/_index.html
@@ -12,7 +12,7 @@
   <li>Implement a search interface using Android's search framework</li>
   <li>Provide custom search suggestions and offer them in Quick Search Box</li>
   <li>Create an SQLite database and an FTS3 table for full-text searches</li>
-  <li>Create a <a href="../../../guide/topics/providers/content-provider.html">content
+  <li>Create a <a href="../../../guide/topics/providers/content-providers.html">content
 provider</a> to perform all search and suggestion queries</li>
   <li>Use <code><a
 href="../../../reference/android/widget/SimpleCursorAdapter.html">SimpleCursorAdapter</a></code> to
diff --git a/samples/SipDemo/_index.html b/samples/SipDemo/_index.html
index dbc9037..0af4a8c 100644
--- a/samples/SipDemo/_index.html
+++ b/samples/SipDemo/_index.html
@@ -13,7 +13,7 @@
     href="src/com/example/android/sip/SipSettings.html"><code>SipSettings</code></a>
   &mdash; a <code>PreferenceActivity</code> that supplies basic settings for SIP
   authentication.</li> <li><a
-    href="src/com/example/android/sip/cube1/IncomingCallReceiver.html"><code>
+    href="src/com/example/android/sip/IncomingCallReceiver.html"><code>
       IncomingCallReceiver</code></a> &mdash; a <code>BroadcastReceiver</code>
   that listens for incoming SIP calls and passes them to
   <code>WalkieTalkieActivity</code> for handling.</li> <li><a