From b974d41601b183bde0fa95235bd83f8be8c12ac6 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Sun, 18 Dec 2005 00:41:10 +0000
Subject: [PATCH] - Update Bluetooth chapter with rc.d integration work, which
 was recently   MFCed into stable branches for upcoming 5.5 and 6.1 releases

---
 .../handbook/advanced-networking/chapter.sgml | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 519b0b9a64..2664d48edc 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -1216,7 +1216,7 @@ ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18Mbps 36Mbps 48Mbps 54Mbps</screen>
           <surname>Lucistnik</surname>
           <contrib>Written by </contrib>
           <affiliation>
-            <address><email>pav@oook.cz</email></address>
+	    <address><email>pav@FreeBSD.org</email></address>
           </affiliation>
         </author>
       </authorgroup>
@@ -1268,6 +1268,11 @@ ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2
 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3,
       wMaxPacketSize=49, nframes=6, buffer size=294</screen>
 
+      <note>
+	<para>The Bluetooth stack has to be started manually on &os; 6.0, and
+	  on &os; 5.X before 5.5.  It is done automatically from &man.devd.8;
+	  on &os; 5.5, 6.1 and newer.</para>
+
       <para>Copy
         <filename>/usr/share/examples/netgraph/bluetooth/rc.bluetooth</filename>
         into some convenient place, like <filename>/etc/rc.bluetooth</filename>.
@@ -1288,6 +1293,7 @@ Max. ACL packet size: 192 bytes
 Number of ACL packets: 8
 Max. SCO packet size: 64 bytes
 Number of SCO packets: 8</screen>
+      </note>
 
     </sect2>
 
@@ -1511,7 +1517,16 @@ c2e8bc80      0    250 00:02:72:00:d4:1a 00:07:e0:00:0b:ca 3    6    OPEN</scree
         accepted, and request the PIN code. Enter the same PIN code as you
         have in <filename>hcsecd.conf</filename>. Now your PC and the remote
         device are paired. Alternatively, you can initiate pairing on the remote
-        device.  The following is a sample of the
+        device.</para>
+
+      <para>On &os; 5.5, 6.1 and newer, the following line can be added to the
+	<filename>/etc/rc.conf</filename> file to have
+	<application>hcsecd</application> started automatically on system
+	start:</para>
+
+      <programlisting>hcsecd_enable="YES"</programlisting>
+
+      <para>The following is a sample of the
         <application>hcsecd</application> daemon output:</para>
 
 <programlisting>hcsecd[16484]: Got Link_Key_Request event from 'ubt0hci', remote bdaddr 0:80:37:29:19:a4
@@ -1588,7 +1603,19 @@ Bluetooth Profile Descriptor List:
       <screen>&prompt.user; <userinput>sdpcontrol -a 00:01:03:fc:6e:ec search OPUSH</userinput></screen>
 
       <para>Offering services on &os; to Bluetooth clients is done with the
-        &man.sdpd.8; server:</para>
+	&man.sdpd.8; server. On &os; 5.5, 6.1 and newer, the following line can
+	be added to the <filename>/etc/rc.conf</filename> file:</para>
+
+      <programlisting>sdpd_enable="YES"</programlisting>
+
+      <para>Then the <application>sdpd</application> daemon can be started with:</para>
+
+      <screen>&prompt.root; <userinput>/etc/rc.d/sdpd start</userinput></screen>
+
+      <para>On &os; 6.0, and on &os; 5.X before 5.5,
+	<application>sdpd</application> is not integrated into the system
+	startup scripts.  It has to be started manually with:</para>
+
       <screen>&prompt.root; <userinput>sdpd</userinput></screen>
 
       <para>The local server application that wants to provide Bluetooth