Updated browsable sample descriptions.

Change-Id: I21e3dfacb4bc1acfbe3b17c5f8001ee758f9eec2
(cherry picked from commit 3943cdc9626911fe2732fedd5c85e920c6078a9f)
diff --git a/samples/browseable/ActivityInstrumentation/_index.jd b/samples/browseable/ActivityInstrumentation/_index.jd
index d1967d3..1cf01c8 100644
--- a/samples/browseable/ActivityInstrumentation/_index.jd
+++ b/samples/browseable/ActivityInstrumentation/_index.jd
@@ -5,9 +5,9 @@
 sample.group=Testing
 @jd:body
 
-<p>
-            
-            This sample provides a basic example of using an InstrumentationTest to probe the
-            internal state of an Activity.
-            
-        </p>
+<p>This sample demonstrates how to use an
+{@link android.test.InstrumentationTestCase} to test the internal state of an
+{@link android.app.Activity}.</p>
+<p>To learn more about using Android's custom testing framework, see
+<a href="{@docRoot}/training/activity-testing/index.html">Testing Your
+Android Activity</a>.</p>
diff --git a/samples/browseable/AdvancedImmersiveMode/_index.jd b/samples/browseable/AdvancedImmersiveMode/_index.jd
index 901b569..2b19c9c 100644
--- a/samples/browseable/AdvancedImmersiveMode/_index.jd
+++ b/samples/browseable/AdvancedImmersiveMode/_index.jd
@@ -5,14 +5,10 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            \"Immersive Mode\" is a new UI mode which improves \"hide full screen\" and
-            \"hide nav bar\" modes, by letting users swipe the bars in and out.  This sample
-            lets the user experiment with immersive mode by enabling it and seeing how it interacts
-            with some of the other UI flags related to full-screen apps.
-            \n\nThis sample also lets the user choose between normal immersive mode and "sticky"
-            immersive mode, which removes the status bar and nav bar
-            a few seconds after the user has swiped them back in.
-            
-        </p>
+<p>Android 4.4 introduces a way for you to provide a more immersive screen
+experience in your app, by letting users show or hide the status bar and
+navigation bar with a swipe.</p>
+<p>This sample demonstrates how this features interacts with some of the other
+UI flags related to full-screen apps. The sample also shows how to implement a
+"sticky" mode, which re-hides the bars a few seconds after the user swipes
+them back in.</p>
diff --git a/samples/browseable/Basic/_index.jd b/samples/browseable/Basic/_index.jd
index 17f668d..72cffd9 100644
--- a/samples/browseable/Basic/_index.jd
+++ b/samples/browseable/Basic/_index.jd
@@ -1,15 +1,15 @@
 
 
 
-page.tags="Basic"
+page.tags="Basic ActionBarCompat"
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample shows you how to use ActionBarCompat to create a basic Activity which
-            displays action items. It covers inflating items from a menu resource, as well as adding
-            an item in code. Items that are not shown as action items on the Action Bar are
-            displayed in the action bar overflow.
-            
-        </p>
+<p>This sample demonstrates how to create a basic action bar that displays
+action items. The sample shows how to inflate items from a menu resource, and
+how to add items programatically. To reduce clutter, rarely used actions are
+displayed in an action bar overflow.</p>
+<p>The activity in this sample extends from
+{@link android.support.v7.app.ActionBarActivity}, which provides the
+functionality necessary to display a compatible action bar on devices
+running Android 2.1 and higher.</p>
diff --git a/samples/browseable/BasicAccessibility/_index.jd b/samples/browseable/BasicAccessibility/_index.jd
index b1c6dde..761aa11 100644
--- a/samples/browseable/BasicAccessibility/_index.jd
+++ b/samples/browseable/BasicAccessibility/_index.jd
@@ -5,8 +5,8 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to create an accessible application, using a mix of different widgets demonstrating different ways of adding accessibility markup to a UI.
-            
-        </p>
+<p>This sample demonstrates how to create applications that are accessible for
+users with visual or physical disabilities.</p>
+<p>To learn how to make the most of the accessibility features built into
+the Android framework, see
+<a href="{@docRoot}training/accessibility/index.html">Implementing Accessibility</a>.</p>
diff --git a/samples/browseable/BasicAndroidKeyStore/_index.jd b/samples/browseable/BasicAndroidKeyStore/_index.jd
index b69787e..5b7af60 100644
--- a/samples/browseable/BasicAndroidKeyStore/_index.jd
+++ b/samples/browseable/BasicAndroidKeyStore/_index.jd
@@ -5,13 +5,11 @@
 sample.group=Security
 @jd:body
 
-<p>
-            
-                Welcome to the <b>Basic Android Key Store</b> sample!\n\n
-                This sample demonstrates how to use the Android Key Store to safely create and store
-                encryption keys that only your application can access.  You can also sign data
-                using those keys.\n\n
-                To create a new KeyPair, click \"Create\".\n\n
-                To sign some data using a KeyPair, click \"Sign\".\n\n
-                To verify the data using the signature provided, click \"Verify\".\n\n            
-        </p>
+<p>This sample demonstrates how to use a {java.security.KeyStore} to
+safely create and store encryption keys that only your application can access.
+You can also sign data using those keys.</p>
+<p>To see this in action, run the sample application and click:</p>
+<ul>
+<li><strong>Create</strong> to create a new KeyPair.</li>
+<li><strong>Sign</strong> to sign some data using a KeyPair.</li>
+<li><strong>Verify</strong> to verify the data using the signature provided.</li>
diff --git a/samples/browseable/BasicContactables/_index.jd b/samples/browseable/BasicContactables/_index.jd
index a947004..f5bb3fc 100644
--- a/samples/browseable/BasicContactables/_index.jd
+++ b/samples/browseable/BasicContactables/_index.jd
@@ -5,10 +5,9 @@
 sample.group=Content
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to use the Contactables table to search for contacts.
-            \n\nQuery strings sent to the Contactables table will match both contact names and phone numbers,
-            reducing the number of queries your application needs to use when searching the contacts database!
-            
-        </p>
+<p>This sample demonstrates how to use the
+{@link android.provider.ContactsContract.Data} table to search for contacts.</p>
+<p>The sample sends consolidated query strings to the
+{@link android.provider.ContactsContract.Data} table to match both contact
+names and phone numbers. This approach helps to reduce the number of
+queries needed when searching the contacts database.</p>
diff --git a/samples/browseable/BasicGestureDetect/_index.jd b/samples/browseable/BasicGestureDetect/_index.jd
index bdcd925..762217a 100644
--- a/samples/browseable/BasicGestureDetect/_index.jd
+++ b/samples/browseable/BasicGestureDetect/_index.jd
@@ -5,9 +5,8 @@
 sample.group=Input
 @jd:body
 
-<p>
-            
-            Welcome to Basic Gesture Detect!
-            In order to try this sample out, try dragging or tapping this text to see what happens!
-            
-        </p>
+<p>This sample demonstrates how to use the {@link android.view.GestureDetector}
+API to detect simple dragging and tapping gestures.</p>
+<p>To learn more about detecting basic touch gestures such as scrolling,
+flinging, and double-tapping, see
+<a href="{@docRoot}training/gestures/detector.html">Detecting Common Gestures</a>.</p>
diff --git a/samples/browseable/BasicImmersiveMode/_index.jd b/samples/browseable/BasicImmersiveMode/_index.jd
index 5394b6b..625e7a2 100644
--- a/samples/browseable/BasicImmersiveMode/_index.jd
+++ b/samples/browseable/BasicImmersiveMode/_index.jd
@@ -5,10 +5,8 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            \"Immersive Mode\" is a new UI mode which improves \"hide full screen\" and
-            \"hide nav bar\" modes, by letting users swipe the bars in and out.  This sample
-            demonstrates how to enable and disable immersive mode programmatically.
-            
-        </p>
+<p>Android 4.4 introduces a way for you to provide a more immersive screen
+experience in your app, by letting users show or hide the status bar and
+navigation bar with a swipe.</p>
+<p>This sample demonstrates how to enable and disable this feature
+programmatically.</p>
diff --git a/samples/browseable/BasicMediaDecoder/_index.jd b/samples/browseable/BasicMediaDecoder/_index.jd
index af8e5e4..3d1a33c 100644
--- a/samples/browseable/BasicMediaDecoder/_index.jd
+++ b/samples/browseable/BasicMediaDecoder/_index.jd
@@ -5,9 +5,5 @@
 sample.group=Media
 @jd:body
 
-<p>
-            
-             This activity uses a TextureView to render the frames of a video decoded using the
-             MediaCodec API.
-            
-        </p>
+<p>This sample demonstrates how to decode a video using
+the {@link android.media.MediaCodec} API and render in an activity.</p>
diff --git a/samples/browseable/BasicMediaRouter/_index.jd b/samples/browseable/BasicMediaRouter/_index.jd
index b97fcff..54081ed 100644
--- a/samples/browseable/BasicMediaRouter/_index.jd
+++ b/samples/browseable/BasicMediaRouter/_index.jd
@@ -5,13 +5,14 @@
 sample.group=Media
 @jd:body
 
-<p>
-            
-            This sample demonstrates the use of the MediaRouter API to display
- content on a secondary display.\n\nUse the "Media Route Action Item" in the ActionBar
- to select an output device. If your device supports Miracast wireless displays,
- you may need to enable "Wireless Display" functionality in the system settings.
- Secondary screen simulation can also be enabled from the "Developer Options".\n\n
-Once connected, use the "Change Color" button to change the background color of the secondary screen.
-            
-        </p>
+<p>This sample demonstrates how to use the {@link android.media.MediaRouter}
+API to display content on a secondary display.</p>
+<p>To see this in action, run the sample and use the
+<strong>Media Route Action Item</strong> in the action bar to select an
+output device. If your device supports Miracast wireless displays, you may
+need to enable <strong>Wireless Display</strong> functionality in the
+system settings.</p>
+<p>You can also enable secondary screen simulation from the
+<em>Developer options</em> in the system Settings. Once
+connected, use the <strong>Change Color</strong> button to change the
+background color of the secondary screen.</p>
diff --git a/samples/browseable/BasicMultitouch/_index.jd b/samples/browseable/BasicMultitouch/_index.jd
index 056ee54..43a1e90 100644
--- a/samples/browseable/BasicMultitouch/_index.jd
+++ b/samples/browseable/BasicMultitouch/_index.jd
@@ -5,11 +5,8 @@
 sample.group=Input
 @jd:body
 
-<p>
-            
-This samples demonstrates the use of MotionEvent properties to keep track of individual touches
-across multiple touch events.
-\n\nTouch the screen with multiple fingers to show that the pointer id
-(also represented by a colour) does not change as new touch events are received.</string>
-            
-        </p>
+<p>This samples demonstrates how to use the {@link android.view.MotionEvent}
+API to keep track of individual touches across multiple touch events.</p>
+<p>To see this in action, run the sample and touch the screen with multiple
+fingers to show that the pointer id (also represented by a colour) does not
+change as new touch events are received.</p>
diff --git a/samples/browseable/BasicNetworking/_index.jd b/samples/browseable/BasicNetworking/_index.jd
index 6f54792..223ba76 100644
--- a/samples/browseable/BasicNetworking/_index.jd
+++ b/samples/browseable/BasicNetworking/_index.jd
@@ -5,11 +5,6 @@
 sample.group=Connectivity
 @jd:body
 
-<p>
-            
-                This sample demonstrates how to use the ConnectivityManager to determine if you have
-                a network connection, and if so, what type of connection it is.
-                \n\nA "NetworkInfo" object is retrieved from the ConnectivityManager, which contains information
-                on the active connection, and then the connection type is printed to an on-screen console.
-            
-        </p>
+<p>This sample demonstrates how to use the
+{@link android.net.ConnectivityManager} to determine if the device has an
+active network connection, and if so, retrieve the connection type.</p>
diff --git a/samples/browseable/BasicNotifications/_index.jd b/samples/browseable/BasicNotifications/_index.jd
index d545068..02a9b56 100644
--- a/samples/browseable/BasicNotifications/_index.jd
+++ b/samples/browseable/BasicNotifications/_index.jd
@@ -5,10 +5,6 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to display events in the system\'s notification bar. The
-            NotificationCompat API is used for compatibility with older devices, running Android
-            2.2 (Froyo) or newer.
-            
-        </p>
+<p>This sample demonstrates how to display events in the system's notification
+bar. The {@link android.support.v4.app.NotificationCompat} API is used for
+compatibility with devices running Android 2.2 or higher.</p>
diff --git a/samples/browseable/BasicSyncAdapter/_index.jd b/samples/browseable/BasicSyncAdapter/_index.jd
index 20f5572..7217e9a 100644
--- a/samples/browseable/BasicSyncAdapter/_index.jd
+++ b/samples/browseable/BasicSyncAdapter/_index.jd
@@ -5,13 +5,10 @@
 sample.group=Connectivity
 @jd:body
 
-<p>
-            
-            This sample demonstrates using SyncAdapter to fetch background data for an app that
-            doesn\'t require a user-visible account type or 2-way synchronization.
-
-            \n\nThis sample periodically downloads the feed from the Android Developer Blog and
-            caches the data in a content provider. At runtime, the cached feed data is displayed
-            inside a ListView.
-            
-        </p>
+<p>This sample demonstrates how to implement a sync adapter to fetch background
+data for an app that doesn't require a user-visible account type or two-way
+synchronization.</p>
+<p>The sample periodically downloads the feed from the <a href="http://android-developers.blogspot.com/">Android Developers Blog</a> and caches the data in a content provider. At runtime, the cached feed data is
+displayed inside a {@link android.widget.ListView}.</p>
+<p>To learn more about creating and using sync adapters, see
+<a href="{@docRoot}training/sync-adapters/index.html">Transferring Data Using Sync Adapters</a>.</p>
diff --git a/samples/browseable/BluetoothLeGatt/_index.jd b/samples/browseable/BluetoothLeGatt/_index.jd
index e30bb0c..6e89669 100644
--- a/samples/browseable/BluetoothLeGatt/_index.jd
+++ b/samples/browseable/BluetoothLeGatt/_index.jd
@@ -5,9 +5,8 @@
 sample.group=Connectivity
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to use the Bluetooth LE Generic Attribute Profile (GATT)
-            to transmit arbitrary data between devices.
-            
-        </p>
+<p>This sample demonstrates how to use the Bluetooth Low Energy Generic
+Attribute Profile (GATT) to transmit arbitrary data between devices. For more
+information about using Android's suppport for Bluetooth Low Energy, see
+<a href="{@docRoot}guide/topics/connectivity/bluetooth-le.html">Bluetooth Low
+Energy</a>.</p>
diff --git a/samples/browseable/BorderlessButtons/_index.jd b/samples/browseable/BorderlessButtons/_index.jd
index 1047950..0d43c98 100644
--- a/samples/browseable/BorderlessButtons/_index.jd
+++ b/samples/browseable/BorderlessButtons/_index.jd
@@ -5,9 +5,5 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-                This sample demonstrates the use of borderless buttons, bottom button bars
-                (OK and Cancel) and dividers to establish visual structure.
-            
-        </p>
+<p>This sample demonstrates how to apply borderless buttons, bottom button bars
+(OK and Cancel), and dividers to establish visual structure.</p>
diff --git a/samples/browseable/CustomChoiceList/_index.jd b/samples/browseable/CustomChoiceList/_index.jd
index aee858e..67a23cc 100644
--- a/samples/browseable/CustomChoiceList/_index.jd
+++ b/samples/browseable/CustomChoiceList/_index.jd
@@ -5,9 +5,5 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-                This sample demonstrates how to create custom checkable layouts, for use with ListView\'s choiceMode
-                attribute.
-            
-        </p>
+<p>This sample demonstrates how to implement a custom single-choice or
+multi-choice {@link android.widget.ListView} user interface.</p>
diff --git a/samples/browseable/CustomNotifications/_index.jd b/samples/browseable/CustomNotifications/_index.jd
index 2da4718..ab3499c 100644
--- a/samples/browseable/CustomNotifications/_index.jd
+++ b/samples/browseable/CustomNotifications/_index.jd
@@ -5,8 +5,5 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample demonstrates notifications with custom content views.
-            
-        </p>
+<p>This sample demonstrates how to implement expanded notifications that
+display custom views.</p>
diff --git a/samples/browseable/DoneBar/_index.jd b/samples/browseable/DoneBar/_index.jd
index 287a04a..8ef219c 100644
--- a/samples/browseable/DoneBar/_index.jd
+++ b/samples/browseable/DoneBar/_index.jd
@@ -5,14 +5,8 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-                This sample demonstrates two alternative presentations of the
-                action bar that are well-suited for simple data entry scenarios.
-
-                In this presentation, a done bar replaces the action
-                bar entirely, providing two direct actions to persist or dismiss changes. This is
-                suitable for cases where no additional view details or actions are needed in the
-                action bar.
-            
-        </p>
+<p>This sample demonstrates a user interface design pattern for simple data
+entry from an {@link android.app.ActionBar}. The sample implements a custom
+<strong>Done/Cancel</strong> bar to provide users with an easy way to directly
+save or cancel their changes. This design pattern is suitable for scenarios
+where no additional view details or actions are needed in the action bar.</p>
diff --git a/samples/browseable/HorizontalPaging/_index.jd b/samples/browseable/HorizontalPaging/_index.jd
index d636d10..acdc1b1 100644
--- a/samples/browseable/HorizontalPaging/_index.jd
+++ b/samples/browseable/HorizontalPaging/_index.jd
@@ -5,9 +5,6 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to implement horizontal paging between fragments in
-            applications that use ActionBar, using a ViewPager widget.
-            
-        </p>
+<p>This sample demonstrates how to implement horizontal paging between
+fragments in an application that has an {@link android.app.ActionBar}, using a
+{@link android.support.v4.view.ViewPager} widget.</p>
diff --git a/samples/browseable/ImmersiveMode/_index.jd b/samples/browseable/ImmersiveMode/_index.jd
index 7c9a272..ab3b718 100644
--- a/samples/browseable/ImmersiveMode/_index.jd
+++ b/samples/browseable/ImmersiveMode/_index.jd
@@ -5,10 +5,8 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            One of the features introduced in KitKat is "immersive mode". Immersive mode gives the
-            user the ability to show/hide the status bar and navigation bar with a swipe.  To try,
-            click the "Toggle immersive mode" button, then try swiping the bar in and out!
-            
-        </p>
+<p>Android 4.4 introduces a way for you to provide a more immersive screen
+experience in your app, by letting users show or hide the status bar and
+navigation bar with a swipe.</p>
+<p>This sample demonstrates how to enable toggling of this feature in a
+{@link android.support.v4.app.Fragment}.</p>
diff --git a/samples/browseable/ListPopupMenu/_index.jd b/samples/browseable/ListPopupMenu/_index.jd
index 97d9587..36090e0 100644
--- a/samples/browseable/ListPopupMenu/_index.jd
+++ b/samples/browseable/ListPopupMenu/_index.jd
@@ -5,9 +5,10 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample shows you how to use {@link android.support.v7.widget.PopupMenu PopupMenu}
-            from ActionBarCompat to create a list, with each item having a dropdown menu.
-            
-        </p>
+<p>This sample demonstrates how to use a backward compatible
+{@link android.support.v7.widget.PopupMenu PopupMenu} to create a list, where
+each list item contains a dropdown menu.</p>
+<p>The activity in this sample extends from
+{@link android.support.v7.app.ActionBarActivity}, which provides the
+functionality necessary to display a compatible action bar on devices
+running Android 2.1 and higher.</p>
diff --git a/samples/browseable/MediaRecorder/_index.jd b/samples/browseable/MediaRecorder/_index.jd
new file mode 100644
index 0000000..dac835a
--- /dev/null
+++ b/samples/browseable/MediaRecorder/_index.jd
@@ -0,0 +1,7 @@
+page.tags="MediaRecorder"
+sample.group=Media
+@jd:body
+
+<p>This sample demonstrates how to use the {@link android.media.MediaRecorder}
+API to record video from a camera or camcorder, and display a preview of the
+recording.</p>
diff --git a/samples/browseable/NetworkConnect/_index.jd b/samples/browseable/NetworkConnect/_index.jd
index 911e8bf..eaac884 100644
--- a/samples/browseable/NetworkConnect/_index.jd
+++ b/samples/browseable/NetworkConnect/_index.jd
@@ -5,9 +5,6 @@
 sample.group=Connectivity
 @jd:body
 
-<p>
-            
-            This sample demonstrates how to connect to the network and fetch raw HTML using
-            HttpURLConnection. AsyncTask is used to perform the fetch on a background thread.
-            
-        </p>
+<p>This sample demonstrates how to connect to the network and fetch raw HTML.
+The sample uses {@link android.os.AsyncTask} to perform the fetch on a
+background thread.</p>
diff --git a/samples/browseable/ShareActionProvider/_index.jd b/samples/browseable/ShareActionProvider/_index.jd
index a503585..31d855e 100644
--- a/samples/browseable/ShareActionProvider/_index.jd
+++ b/samples/browseable/ShareActionProvider/_index.jd
@@ -5,9 +5,10 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample shows you how a provide a context-sensitive ShareActionProvider with
-            ActionBarCompat, backwards compatible to API v7.
-            
-        </p>
+<p>This sample demonstrates how to use a
+context-sensitive {@link android.support.v7.widget.ShareActionProvider} that is
+backward compatible.</p>
+<p>The activity in this sample extends from
+{@link android.support.v7.app.ActionBarActivity}, which provides the
+functionality necessary to display a compatible action bar on devices
+running Android 2.1 and higher.</p>
diff --git a/samples/browseable/StorageClient/_index.jd b/samples/browseable/StorageClient/_index.jd
index 2a7aaa0..e81e6b2 100644
--- a/samples/browseable/StorageClient/_index.jd
+++ b/samples/browseable/StorageClient/_index.jd
@@ -5,11 +5,8 @@
 sample.group=Content
 @jd:body
 
-<p>
-            
-            Using the OPEN_DOCUMENT intent, a client app can access a list of Document Providers
-            on the device, and choose a file from any of them.
-            \n\nTo demonstrate this, click the button below to open up the Storage Access Framework
-            interface, and choose an image on your device.  It will be displayed in this app.
-            
-        </p>
+<p>This sample demonstrates how to use the
+{@link android.content.Intent#ACTION_OPEN_DOCUMENT} intent to let users
+choose a file via the system's file browser. This intent allows a client
+application to access a list of document providers on the device, and choose
+a file from any of them.</p>
diff --git a/samples/browseable/Styled/_index.jd b/samples/browseable/Styled/_index.jd
index 58942bf..0816197 100644
--- a/samples/browseable/Styled/_index.jd
+++ b/samples/browseable/Styled/_index.jd
@@ -1,13 +1,13 @@
 
 
 
-page.tags="Styled"
+page.tags="Styled ActionBarCompat"
 sample.group=UI
 @jd:body
 
-<p>
-            
-            This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a
-            split action bar when running on a device with a narrow display, and show three tabs.
-            
-        </p>
+<p>This sample demonstrates how to use a backward compatible
+{@link android.support.v7.app.ActionBar} with a customized theme.</p>
+<p>The activity in this sample extends from
+{@link android.support.v7.app.ActionBarActivity}, which provides the
+functionality necessary to display a compatible action bar on devices
+running Android 2.1 and higher.</p>
diff --git a/samples/browseable/TextLinkify/_index.jd b/samples/browseable/TextLinkify/_index.jd
index 194c3f6..cab17fd 100644
--- a/samples/browseable/TextLinkify/_index.jd
+++ b/samples/browseable/TextLinkify/_index.jd
@@ -5,9 +5,12 @@
 sample.group=Views
 @jd:body
 
-<p>
-            
-            This sample illustrates how links can be added to a TextView. This can be done either
-            automatically by setting the "autoLink" property or explicitly.
-            
-        </p>
+<p>This sample demonstrates how to add clickable links to a
+{@link android.widget.TextView}, by using these techniques:
+<ul>
+<li>Setting the {@link android.widget.TextView#attr_android:autoLink} property
+to automatically convert the text to a link.</li>
+<li>Parsing a String as HTML</li>
+<li>Manually by constructing a {@link android.text.SpannableString}.</li>
+</ul>
+</p>
diff --git a/samples/browseable/TextSwitcher/_index.jd b/samples/browseable/TextSwitcher/_index.jd
index 40e991b..0fc5c32 100644
--- a/samples/browseable/TextSwitcher/_index.jd
+++ b/samples/browseable/TextSwitcher/_index.jd
@@ -5,10 +5,7 @@
 sample.group=UI
 @jd:body
 
-<p>
-            
-                This sample illustrates the use of a TextSwitcher to display text.
-                \n\nClick the button below to set new text in the TextSwitcher and observe the
-                in and out fade animations.
-            
-        </p>
+<p>This sample demonstrates how to use the {@link android.widget.TextSwitcher}
+view with animations. A {@link android.widget.TextSwitcher} is a type of
+{@link android.widget.ViewSwitcher} that animates text transitions on screen
+when {@link android.widget.TextSwitcher#setText(CharSequence)} is called.</p>
diff --git a/samples/browseable/repeatingAlarm/_index.jd b/samples/browseable/repeatingAlarm/_index.jd
index 6abb305..bd77d6c 100644
--- a/samples/browseable/repeatingAlarm/_index.jd
+++ b/samples/browseable/repeatingAlarm/_index.jd
@@ -1,13 +1,9 @@
 
 
 
-page.tags="repeatingAlarm"
+page.tags="RepeatingAlarm"
 sample.group=Background
 @jd:body
 
-<p>
-            
-                Introductory text that explains what the sample is intended to demonstrate. Edit
-                in template-params.xml.
-            
-        </p>
+<p>This sample demonstrates how to implement a repeating alarm using an
+{@link android.app.AlarmManager}.</p>