summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-15 10:46:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-15 10:46:33 -0700
commitfda5b19c757645e957c2a224f269aefe39fb1e1c (patch)
tree668cce6a560eea069f866f3bd51488d0d1028a10 /core/java/android/bluetooth
parent09da96099917141f2b90d53f61baa822bdd434d7 (diff)
parent36cdecd89dbc3eb503197414f525e30ee241ba66 (diff)
downloadframeworks_base-fda5b19c757645e957c2a224f269aefe39fb1e1c.zip
frameworks_base-fda5b19c757645e957c2a224f269aefe39fb1e1c.tar.gz
frameworks_base-fda5b19c757645e957c2a224f269aefe39fb1e1c.tar.bz2
Merge "docs: fix typo; surface dev guide link in package description" into froyo
Diffstat (limited to 'core/java/android/bluetooth')
-rw-r--r--core/java/android/bluetooth/package.html11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html
index 5ff240c..9ac42dc 100644
--- a/core/java/android/bluetooth/package.html
+++ b/core/java/android/bluetooth/package.html
@@ -1,7 +1,11 @@
<HTML>
<BODY>
-Provides classes that manage Bluetooth functionality, such as scanning for
-devices, connecting with devices, and managing data transfer between devices.
+<p>Provides classes that manage Bluetooth functionality, such as scanning for
+devices, connecting with devices, and managing data transfer between devices.</p>
+
+<p>For a complete guide to using the Bluetooth APIs, see the <a
+href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
+{@more}
<p>The Bluetooth APIs let applications:</p>
<ul>
@@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
permission.
</p>
-<p>For a detailed guide to using the Bluetooth APIs, see the <a
-href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth Dev Guide topic</a>.</p>
-
<p class="note"><strong>Note:</strong>
Not all Android devices are guaranteed to have Bluetooth functionality.</p>
</BODY>