diff --git a/samples/ApiDemos/src/com/example/android/apis/app/_index.html b/samples/ApiDemos/src/com/example/android/apis/app/_index.html
index f688413cf..5a2a31f3c 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/app/_index.html
@@ -1,5 +1,17 @@
 
-<h3>Activity</h3>
+<p>This section includes samples for:</p>
+<ul>
+  <li><a href="#Activity">Activity</a></li>
+  <li><a href="#Fragment">Fragment</a></li>
+  <li><a href="#LoaderManager">LoaderManager</a></li>
+  <li><a href="#Alarm">Alarm</a></li>
+  <li><a href="#Notification">Notification</a></li>
+  <li><a href="#Search">Search</a></li>
+  <li><a href="#Misc">Misc</a></li>
+</ul>
+
+
+<h3 id="Activity">Activity</h3>
 <dl>
   <dt><a href="HelloWorld.html">Hello World</a></dt>
   <dd>Demonstrates a basic screen activity.
@@ -73,7 +85,7 @@
   on top of the system wallpaper.</dd>
 </dl>
 
-<h3>Fragment</h3>
+<h3 id="Fragment">Fragment</h3>
 <dl>
   <dt><a href="FragmentAlertDialog.html">Fragment Alert Dialog</a></dt>
   <dd>Demonstrates how to use a DialogFragment to show and manage an
@@ -122,7 +134,7 @@
   
 </dl>
 
-<h3>LoaderManager</h3>
+<h3 id="LoaderManager">LoaderManager</h3>
 <dl>
   <dt><a href="LoaderThrottle.html">Loader Throttle</a></dt>
   <dd>Complete end-to-end demonstration of a simple content provider that
@@ -132,7 +144,7 @@
   in this case.</dd>
 </dl>
   
-<h3>Service</h3>
+<h3 id="Service">Service</h3>
 <dl>
   <dt><a href="LocalService.html">Local Service</a></dt>
   <dd>Demonstrate the implementation of a service that runs in the same
@@ -180,7 +192,7 @@
 
 </dl>
 
-<h3>Alarm</h3>
+<h3 id="Alarm">Alarm</h3>
 <dl>
   <dt><a href="AlarmController.html">Alarm Controller</a></dt>
   <dd>Demonstrates two ways you can schedule alarms: a one-shot alarm that
@@ -213,7 +225,7 @@
   </dd>
 </dl>
 
-<h3>Notification</h3>
+<h3 id="Notification">Notification</h3>
 <dl>
   <dt><a href="NotifyWithText.html">NotifyWithText</a></dt>
   <dd>Demonstrates popup notifications of varying length.</dd>
@@ -226,7 +238,7 @@
   the status bar, and a standard way for handling them.</dd>
 </dl>
 
-<h3>Search</h3>
+<h3 id="Search">Search</h3>
 <dl>
   <dt><a href="SearchInvoke.html">SearchInvoke</a></dt>
   <dd>Demonstrates various ways in which activities can launch the Search UI.</dd>
@@ -239,7 +251,7 @@
 </dl>
 
 
-<h3>Misc</h3>
+<h3 id="Misc">Misc</h3>
 <dl>
   <dt><a href="AlertDialogSamples.html">Alert Dialog Samples</a></dt>
   <dd>Demonstrates various styles of alert dialogs.</dd>
diff --git a/samples/ApiDemos/src/com/example/android/apis/text/_index.html b/samples/ApiDemos/src/com/example/android/apis/text/_index.html
index ee1020bc9..c995a0cac 100644
--- a/samples/ApiDemos/src/com/example/android/apis/text/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/text/_index.html
@@ -1,6 +1,8 @@
 <dl>
   <dt><a href="Link.html">Linkify</a></dt>
-  <dd>Demonstrates the {@link android.text.util.Linkify Linkify} class, which converts URLs in a block of text into hyperlinks. </dd>
+  <dd>Demonstrates the <a                                                                            
+href="../../../../../../../../../reference/android/text/util/Linkify.html"><code>Linkify</code>
+class, which converts URLs in a block of text into hyperlinks. </dd>
 </dl>