Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision fb0655cd370f117a1358128d26bb102e49fc01d0)
+++ general/sysutils/bluez.xml	(revision 1fa2b35423c58a7059e2f16872272b74ffc7dc2f)
@@ -302,7 +302,15 @@
       <seglistitem>
         <seg>
-          bccmd, bluemoon, bluetoothctl, bluetoothd (symlink), btattach, btmon, ciptool,
-          hciattach, hciconfig, hcidump, hcitool, hex2hcd, l2ping, l2test,
-          mpris-proxy, rctest, rfcomm, and sdptool
+          bccmd, 
+          bluemoon, 
+          bluetoothctl, 
+          bluetoothd (symlink), 
+          btattach, 
+          btmon, 
+          hex2hcd, 
+          l2ping, 
+          l2test,
+          mpris-proxy, and 
+          rctest
         </seg>
         <seg>
@@ -310,5 +318,6 @@
         </seg>
         <seg>
-          /etc/bluetooth, /usr/{include,libexec}/bluetooth, and
+          /etc/bluetooth, 
+          /usr/{include,libexec}/bluetooth, and
           /usr/share/doc/bluez-&bluez-version;
         </seg>
@@ -383,69 +392,4 @@
       </varlistentry>
 
-      <varlistentry id="ciptool">
-        <term><command>ciptool</command></term>
-        <listitem>
-          <para>
-            is used to set up, maintain, and inspect the CIP configuration
-            of the Bluetooth subsystem in the Linux kernel.
-          </para>
-          <indexterm zone="bluez ciptool">
-            <primary sortas="b-ciptool">ciptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hciattach">
-        <term><command>hciattach</command></term>
-        <listitem>
-          <para>
-            is used to attach a serial UART to the Bluetooth stack
-            as HCI transport interface.
-          </para>
-          <indexterm zone="bluez hciattach">
-            <primary sortas="b-hciattach">hciattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hciconfig">
-        <term><command>hciconfig</command></term>
-        <listitem>
-          <para>
-            is used to configure Bluetooth devices.
-          </para>
-          <indexterm zone="bluez hciconfig">
-            <primary sortas="b-hciconfig">hciconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hcidump">
-        <term><command>hcidump</command></term>
-        <listitem>
-          <para>
-            reads raw HCI data coming from and going to a Bluetooth
-            device and prints to screen commands, events and data
-            in a human-readable form.
-          </para>
-          <indexterm zone="bluez hcidump">
-            <primary sortas="b-hcidump">hcidump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="hcitool">
-        <term><command>hcitool</command></term>
-        <listitem>
-          <para>
-            is used to configure Bluetooth connections and send some
-            special command to Bluetooth devices.
-          </para>
-          <indexterm zone="bluez hcitool">
-            <primary sortas="b-hcitool">hcitool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="hex2hcd">
@@ -461,17 +405,4 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="hid2hci">
-        <term><command>hid2hci</command></term>
-        <listitem>
-          <para>
-            is used to set up switch supported Bluetooth devices into
-            the HCI mode and back.
-          </para>
-          <indexterm zone="bluez hid2hci">
-            <primary sortas="b-hid2hci">hid2hci</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
 
       <varlistentry id="l2ping">
@@ -499,16 +430,4 @@
         </listitem>
       </varlistentry>
-<!--
-     <varlistentry id="obexd">
-        <term><command>obexd</command></term>
-        <listitem>
-          <para>
-            is the OBEX daemon.
-          </para>
-          <indexterm zone="bluez obexd">
-            <primary sortas="b-obexd">obexd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
 
       <varlistentry id="rctest">
@@ -525,30 +444,4 @@
       </varlistentry>
 
-      <varlistentry id="rfcomm">
-        <term><command>rfcomm</command></term>
-        <listitem>
-          <para>
-            is used to set up, maintain, and inspect the RFCOMM
-            configuration of the Bluetooth subsystem in the
-            Linux kernel.
-          </para>
-          <indexterm zone="bluez rfcomm">
-            <primary sortas="b-rfcomm">rfcomm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sdptool">
-        <term><command>sdptool</command></term>
-        <listitem>
-          <para>
-            is used to perform SDP queries on Bluetooth devices.
-          </para>
-          <indexterm zone="bluez sdptool">
-            <primary sortas="b-sdptool">sdptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libbluetooth">
         <term><filename class="libraryfile">libbluetooth.so</filename></term>
