Merge "docs: fix typo; surface dev guide link in package description" into froyo

scottamain · Android (Google) Code Review · commit fda5b19c7576 · 2010-10-15T10:46:33.000-07:00
diff --git 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 @@
 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>
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -9,7 +9,7 @@ page.title=Bluetooth
     <li>Android's bluetooth APIs allow your application to perform wireless data transactions with
 other devices</li>
   </ul>
-  
+
   <h2>In this document</h2>
   <ol>
     <li><a href="#TheBasics">The Basics</a></li>
@@ -32,7 +32,7 @@ other devices</li>
     </li>
     <li><a href="#ManagingAConnection">Managing a Connection</a></li>
   </ol>
-  
+
   <h2>Key classes</h2>
   <ol>
     <li>{@link android.bluetooth.BluetoothAdapter}</li>
@@ -289,7 +289,7 @@ is discussed below.</p>
 of paired devices to see if the desired device is already known. To do so,
 call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This
 will return a Set of {@link android.bluetooth.BluetoothDevice}s representing
-paired devices. For example, you can query all paired devices and then add then
+paired devices. For example, you can query all paired devices and then
 show the name of each device to the user, using an ArrayAdapter:</p>
 <pre>
 Set&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
