Let us hurry. There is nothing to fear here.

That's what scares me.

10 files changed, 11 insertions, 765 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 36a2eb83419..0bd46aae0ff 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.576 2014/05/06 17:20:39 pirofti Exp $
+#	$OpenBSD: Makefile,v 1.577 2014/07/11 22:10:51 tedu Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -13,8 +13,8 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	asbtm.4 ast.4 atapiscsi.4 atphy.4 ath.4 athn.4 atu.4 atw.4 \
 	auacer.4 audio.4 \
 	aue.4 auglx.4 auich.4 auixp.4 autri.4 auvia.4 axe.4 axen.4 az.4 azalia.4 \
-	bce.4 berkwdt.4 bge.4 bha.4 bio.4 bktr.4 bluetooth.4 bmtphy.4 bnx.4 \
-	boca.4 bpf.4 brgphy.4 bridge.4 brswphy.4 btkbd.4 btms.4 btsco.4 bwi.4 \
+	bce.4 berkwdt.4 bge.4 bha.4 bio.4 bktr.4 bmtphy.4 bnx.4 \
+	boca.4 bpf.4 brgphy.4 bridge.4 brswphy.4 bwi.4 \
 	cac.4 cas.4 cardbus.4 carp.4 cd.4 cdce.4 cdcef.4 che.4 cfxga.4 \
 	ch.4 ciphy.4 ciss.4 clcs.4 clct.4 cmpci.4 cnw.4 \
 	com.4 crypto.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 \
@@ -48,7 +48,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	qla.4 qle.4 qlw.4 qsphy.4 radio.4 \
 	ral.4 random.4 rd.4 rdac.4 re.4 rdcphy.4 rgephy.4 ricohrtc.4 \
 	rl.4 rlphy.4 route.4 rsu.4 rt.4 rtsx.4 rum.4 run.4 \
-	rtfps.4 rtii.4 rtw.4 safe.4 safte.4 san.4 sbt.4 sbus.4 schsio.4 \
+	rtfps.4 rtii.4 rtw.4 safe.4 safte.4 san.4 sbus.4 schsio.4 \
 	scsi.4 sd.4 \
 	sdmmc.4 sdhc.4 se.4 ses.4 \
 	sf.4 sf2r.4 sfr.4 sili.4 siop.4 sis.4 sk.4 sl.4 sli.4 \
@@ -56,7 +56,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	st.4 ste.4 stge.4 sti.4 \
 	stp.4 sv.4 sym.4 systrace.4 tcic.4 tcp.4 termios.4 tht.4 ti.4 tl.4 \
 	tlphy.4 thmc.4 tqphy.4 trm.4 trunk.4 tsl.4 tty.4 tun.4 twe.4 txp.4 \
-	txphy.4 uaudio.4 uark.4 uath.4 ubcmtp.4 uberry.4 ubsa.4 ubsec.4 ubt.4 \
+	txphy.4 uaudio.4 uark.4 uath.4 ubcmtp.4 uberry.4 ubsa.4 ubsec.4 \
 	ucom.4 uchcom.4 ucycom.4 udav.4 udcf.4 udfu.4 udl.4 udp.4 udsbr.4 \
 	uftdi.4 ugen.4 ugl.4 ugold.4 uguru.4 uhci.4 uhid.4 uhidev.4 uipaq.4 \
 	uk.4 ukbd.4 \
diff --git a/share/man/man4/bluetooth.4 b/share/man/man4/bluetooth.4
deleted file mode 100644
index f13455c2684..00000000000
--- a/share/man/man4/bluetooth.4
+++ /dev/null
@@ -1,405 +0,0 @@
-.\"	$OpenBSD: bluetooth.4,v 1.9 2013/07/16 16:05:48 schwarze Exp $
-.\"	$NetBSD: bluetooth.4,v 1.5 2007/04/21 06:15:22 plunky Exp $
-.\"
-.\" Copyright (c) 2006 Itronix Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Iain Hibbert for Itronix Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of Itronix Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific
-.\"    prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt BLUETOOTH 4
-.Os
-.Sh NAME
-.Nm bluetooth
-.Nd Bluetooth protocol family
-.Sh SYNOPSIS
-.In netbt/bluetooth.h
-.In netbt/hci.h
-.In netbt/l2cap.h
-.In netbt/rfcomm.h
-.Sh DESCRIPTION
-Bluetooth protocol family sockets all use a
-.Ar sockaddr_bt
-structure which contains a Bluetooth Device Address (BDADDR).
-This consists of a six byte string in least significant byte
-first order.
-.Bd -literal -offset indent
-struct sockaddr_bt {
-	uint8_t		bt_len;
-	sa_family_t	bt_family;
-	bdaddr_t	bt_bdaddr;
-	uint16_t	bt_psm;
-	uint8_t		bt_channel;
-};
-.Ed
-.Pp
-The local address used by the socket can be set with
-.Xr bind 2 .
-.Pp
-.Ox
-provides support for the following devices:
-.Ss Human Interface Devices
-.Bl -tag -width 12n -offset ind -compact
-.It Xr btkbd 4
-Bluetooth keyboard support
-.It Xr btms 4
-Bluetooth mouse support
-.El
-.Sh PROTOCOLS
-Protocols included are:
-.Bl -tag -width XX
-.It Cm BTPROTO_HCI
-This gives raw access to the Host Controller Interface of local devices
-using the HCI protocol as described in the Bluetooth Core Specification.
-Any user may open an HCI socket but there are limitations on what
-unprivileged users can send and receive.
-The local address specified by
-.Xr bind 2
-may be used to select the device that the socket will receive packets from.
-If
-.Dv BDADDR_ANY
-is specified then the socket will receive packets from all
-devices on the system.
-.Xr connect 2
-may be used to create connections such that packets sent with
-.Xr send 2
-will be delivered to the specified device, otherwise
-.Xr sendto 2
-should be used.
-.Pp
-The
-.Ar bt_psm
-and
-.Ar bt_channel
-fields in the sockaddr_bt structure are ignored by HCI protocol code
-and should be set to zero.
-.Pp
-HCI socket options:
-.Bl -tag -width XX
-.It Dv SO_HCI_EVT_FILTER Op Ar struct hci_filter
-This filter controls which events will be received at the socket.
-See
-.Aq Pa netbt/hci.h
-for available events.
-By default, only Command_Complete and Command_Status
-events are enabled.
-.It Dv SO_HCI_PKT_FILTER Op Ar struct hci_filter
-This filter controls the type of packets that will be received at the
-socket.
-By default, only Event packets are enabled.
-.It Dv SO_HCI_DIRECTION Op Ar int
-When set, this enables control messages on packets received at the socket
-indicating the direction of travel of the packet.
-.El
-.Pp
-HCI
-.Xr sysctl 8
-controls:
-.Bl -tag -width XXX
-.It Dv net.bluetooth.hci.sendspace
-Default send buffer size for HCI sockets.
-.It Dv net.bluetooth.hci.recvspace
-Default receive buffer size for HCI sockets.
-.It Dv net.bluetooth.hci.acl_expiry
-If set, this is the time in seconds after which unused ACL data connections
-will be expired.
-If zero, connections will not be closed.
-.It Dv net.bluetooth.hci.memo_expiry
-Time, in seconds, that the system will keep records of Bluetooth devices
-in the vicinity after an Inquiry Response packet has been received.
-This information is used for routing purposes.
-.It Dv net.bluetooth.hci.eventq_max
-The maximum number of packets on the low level Event queue.
-.It Dv net.bluetooth.hci.aclrxq_max
-The maximum number of packets on the low level ACL queue.
-.It Dv net.bluetooth.hci.scorxq_max
-The maximum number of packets on the low level SCO queue.
-.El
-.It Cm BTPROTO_L2CAP
-L2CAP sockets give sequential packet access over channels to other Bluetooth
-devices and make use of the
-.Ar bt_psm
-field in the
-.Ar sockaddr_bt
-structure to select the Protocol/Service Multiplexer to specify when making
-connections.
-.Pp
-L2CAP socket options:
-.Bl -tag -width XXX
-.It Dv SO_L2CAP_IMTU Op Ar uint16_t
-Incoming MTU.
-.It Dv SO_L2CAP_OMTU Op Ar uint16_t
-Outgoing MTU (read-only).
-.It Dv SO_L2CAP_LM Op Ar int
-Link Mode.
-The following bits may be set:
-.Pp
-.Bl -tag -compact -width ".Dv L2CAP_LM_ENCRYPT"
-.It Dv L2CAP_LM_AUTH
-Request authentication
-.Pq pairing .
-.It Dv L2CAP_LM_ENCRYPT
-Request encryption
-.Pq includes auth .
-.It Dv L2CAP_LM_SECURE
-Request secured link
-.Pq encryption, plus change link key .
-.El
-.Pp
-Link mode settings will be applied to the baseband link during L2CAP
-connection establishment.
-If the L2CAP connection is already established,
-.Dv EINPROGRESS
-may be returned, and it is not possible to guarantee that data already queued
-.Pq from either end
-will not be delivered.
-If the mode change fails, the L2CAP connection will be aborted.
-.El
-.Pp
-L2CAP
-.Xr sysctl 8
-controls:
-.Bl -tag -width XXX
-.It Dv net.bluetooth.l2cap.sendspace
-Default send buffer size for L2CAP sockets.
-.It Dv net.bluetooth.l2cap.recvspace
-Default receive buffer size for L2CAP sockets.
-.It Dv net.bluetooth.l2cap.rtx
-Response Timeout eXpiry for L2CAP signals.
-.It Dv net.bluetooth.l2cap.ertx
-Extended Response Timeout eXpiry for L2CAP signals.
-.El
-.It Cm BTPROTO_RFCOMM
-RFCOMM sockets provide streamed data over Bluetooth connections
-and make use of the
-.Ar bt_psm
-and
-.Ar bt_channel
-fields in the
-.Ar sockaddr_bt
-structure.
-The channel number must be between 1 and 30 inclusive.
-If no PSM is specified, a default value of
-.Dv L2CAP_PSM_RFCOMM
-(0x0003) will be used.
-.Pp
-RFCOMM socket options:
-.Bl -tag -width XXX
-.It Dv SO_RFCOMM_MTU Op Ar uint16_t
-Maximum Frame Size to use for this link.
-.It Dv SO_RFCOMM_LM Op Ar int
-Link Mode.
-The following bits may be set at any time:
-.Pp
-.Bl -tag -compact -width ".Dv RFCOMM_LM_ENCRYPT"
-.It Dv RFCOMM_LM_AUTH
-Request authentication
-.Pq pairing .
-.It Dv RFCOMM_LM_ENCRYPT
-Request encryption
-.Pq includes auth .
-.It Dv RFCOMM_LM_SECURE
-Request secured link
-.Pq encryption, plus change link key .
-.El
-.Pp
-Link mode settings will be applied to the baseband link during RFCOMM
-connection establishment.
-If the RFCOMM connection is already established,
-.Dv EINPROGRESS
-may be returned, and it is not possible to guarantee that data already queued
-.Pq from either end
-will not be delivered.
-If the mode change fails, the RFCOMM connection will be aborted.
-.El
-.Pp
-RFCOMM
-.Xr sysctl 8
-controls:
-.Bl -tag -width XXX
-.It Dv net.bluetooth.rfcomm.sendspace
-Default send buffer size for RFCOMM sockets.
-.It Dv net.bluetooth.rfcomm.recvspace
-Default receive buffer size for RFCOMM sockets.
-.It Dv net.bluetooth.rfcomm.default_mtu
-Maximum Frame Size (N1).
-.It Dv net.bluetooth.ack_timeout
-Acknowledgement Timer (T1).
-.It Dv net.bluetooth.mcc_timeout
-Response Timer for Multiplexer Control Channel (T2).
-.El
-.It Cm BTPROTO_SCO
-SCO sockets provide sequential packet access to time sensitive data
-channels over Bluetooth connections, typically used for audio data.
-.Pp
-SCO socket options:
-.Bl -tag -width XXX
-.It Dv SO_SCO_MTU Op Ar uint16_t
-Maximum packet size for use on this link.
-This is read-only and will be set by the protocol code when a connection is made.
-Currently, due to limitations in the
-.Xr ubt 4
-driver, the SCO protocol code will only accept packets with
-exactly this size.
-.It Dv SO_SCO_HANDLE Op Ar uint16_t
-Connection handle for this link.
-This is read-only and provided for informational purposes only.
-.El
-.Pp
-SCO
-.Xr sysctl 8
-controls:
-.Bl -tag -width XXX
-.It Dv net.bluetooth.sco.sendspace
-Default send buffer size for SCO sockets.
-.It Dv net.bluetooth.sco.recvspace
-Default receive buffer size for SCO sockets.
-.El
-.El
-.Sh INFORMATION
-The following
-.Xr ioctl 2
-calls may be used to manipulate Bluetooth devices.
-The
-.Xr ioctl 2
-must be made on
-.Cm BTPROTO_HCI
-sockets.
-All of the requests take a
-.Ar btreq
-structure defined as follows as their parameter and unless otherwise
-specified, use the
-.Ar btr_name
-field to identify the device.
-.Bd -literal -offset 3n
-struct btreq {
-    char btr_name[HCI_DEVNAME_SIZE];	/* device name */
-
-    union {
-	struct {
-	    bdaddr_t btri_bdaddr;	/* device bdaddr */
-	    uint16_t btri_flags;	/* flags */
-	    uint16_t btri_num_cmd;	/* # of free cmd buffers */
-	    uint16_t btri_num_acl;	/* # of free ACL buffers */
-	    uint16_t btri_num_sco;	/* # of free SCO buffers */
-	    uint16_t btri_acl_mtu;	/* ACL mtu */
-	    uint16_t btri_sco_mtu;	/* SCO mtu */
-	    uint16_t btri_link_policy;	/* Link Policy */
-	    uint16_t btri_packet_type;	/* Packet Type */
-	} btri;
-	struct bt_stats btrs;   /* unit stats */
-    } btru;
-};
-
-#define btr_flags	btru.btri.btri_flags
-#define btr_bdaddr	btru.btri.btri_bdaddr
-#define btr_num_cmd	btru.btri.btri_num_cmd
-#define btr_num_acl	btru.btri.btri_num_acl
-#define btr_num_sco	btru.btri.btri_num_sco
-#define btr_acl_mtu	btru.btri.btri_acl_mtu
-#define btr_sco_mtu	btru.btri.btri_sco_mtu
-#define btr_link_policy btru.btri.btri_link_policy
-#define btr_packet_type btru.btri.btri_packet_type
-#define btr_stats	btru.btrs
-
-/* btr_flags */
-#define BTF_UP			(1\*[Lt]\*[Lt]0)	/* unit is up */
-#define BTF_RUNNING		(1\*[Lt]\*[Lt]1)	/* unit is running */
-#define BTF_XMIT_CMD		(1\*[Lt]\*[Lt]2)	/* transmitting CMD packets */
-#define BTF_XMIT_ACL		(1\*[Lt]\*[Lt]3)	/* transmitting ACL packets */
-#define BTF_XMIT_SCO		(1\*[Lt]\*[Lt]4)	/* transmitting SCO packets */
-#define BTF_INIT_BDADDR		(1\*[Lt]\*[Lt]5)	/* waiting for bdaddr */
-#define BTF_INIT_BUFFER_SIZE	(1\*[Lt]\*[Lt]6)	/* waiting for buffer size */
-#define BTF_INIT_FEATURES	(1\*[Lt]\*[Lt]7)	/* waiting for features */
-
-struct bt_stats {
-	uint32_t	err_tx;
-	uint32_t	err_rx;
-	uint32_t	cmd_tx;
-	uint32_t	evt_rx;
-	uint32_t	acl_tx;
-	uint32_t	acl_rx;
-	uint32_t	sco_tx;
-	uint32_t	sco_rx;
-	uint32_t	byte_tx;
-	uint32_t	byte_rx;
-};
-
-.Ed
-.Bl -tag -width SIOCGBTPOLICY
-.It Dv SIOCGBTINFO
-Get Bluetooth device info.
-Given the device name, fill in the
-btreq structure including the address field for use with socket addressing
-as above.
-.It Dv SIOCGBTINFOA
-Get Bluetooth device info from address.
-Given the device address, fill in the
-btreq structure including the name field.
-.It Dv SIOCNBTINFO
-Next Bluetooth device info.
-If the name field is empty, the first device
-will be returned.
-Otherwise, the next device will be returned.
-This can be used to
-cycle through all devices in the system.
-.It Dv SIOCSBTFLAGS
-Set Bluetooth device flags.
-Not all flags can be set.
-.It Dv SIOCSBTPOLICY
-Set Bluetooth device link policy.
-Link policy bits are defined in
-.Aq Pa netbt/hci.h ,
-though bits can only be set if the device supports it.
-.It Dv SIOCSBTPTYPE
-Set Bluetooth device packet types.
-Only packet types
-that the device supports
-can be set.
-.It Dv SIOCGBTSTATS
-Read device statistics.
-.It Dv SIOCZBTSTATS
-Read device statistics, and zero them.
-.El
-.Pp
-Only the super-user may change device configurations.
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr getsockname 2 ,
-.Xr options 4 ,
-.Xr ubt 4
-.Sh HISTORY
-The Bluetooth protocol stack was written for
-.Nx 4.0
-by
-.An Iain Hibbert
-under the sponsorship of Itronix, Inc. and
-ported to
-.Ox 4.2
-by
-.An Uwe Stuehler Aq Mt uwe@openbsd.org .
diff --git a/share/man/man4/btkbd.4 b/share/man/man4/btkbd.4
deleted file mode 100644
index ea00e97f42f..00000000000
--- a/share/man/man4/btkbd.4
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" $OpenBSD: btkbd.4,v 1.3 2010/01/14 05:37:27 tedu Exp $
-.\" $NetBSD: btkbd.4,v 1.3 2006/12/23 06:58:20 wiz Exp $
-.\"
-.\" Copyright (c) 2006 Itronix Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Iain Hibbert for Itronix Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of Itronix Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific
-.\"    prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd $Mdocdate: January 14 2010 $
-.Dt BTKBD 4
-.Os
-.Sh NAME
-.Nm btkbd
-.Nd Bluetooth keyboard support
-.Sh SYNOPSIS
-.Cd "btkbd*	at bthidev?"
-.Cd "wskbd*	at btkbd?"
-.Pp
-.Cd options	BTKBD_REPEAT
-.Cd options	BTKBD_LAYOUT=XXX
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for Bluetooth wireless keyboards.
-Access to the keyboard is through the
-.Xr wskbd 4
-driver.
-.Sh SEE ALSO
-.Xr bluetooth 4 ,
-.Xr wskbd 4
-.Sh HISTORY
-The
-.Nm
-driver appeared in
-.Nx 4.0
-and was written by
-.An Iain Hibbert
-under the sponsorship of Itronix, Inc.
-.Sh BUGS
-Due to configuration and connection requirements, Bluetooth keyboards
-cannot be used until the system is fully booted.
-.Pp
-Bluetooth keyboards cannot be the system console.
diff --git a/share/man/man4/btms.4 b/share/man/man4/btms.4
deleted file mode 100644
index 20edddf7be7..00000000000
--- a/share/man/man4/btms.4
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" $OpenBSD: btms.4,v 1.2 2007/07/27 23:01:27 jmc Exp $
-.\" $NetBSD: btms.4,v 1.3 2006/12/23 06:58:20 wiz Exp $
-.\"
-.\" Copyright (c) 2006 Itronix Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Iain Hibbert for Itronix Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of Itronix Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific
-.\"    prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: July 27 2007 $
-.Dt BTMS 4
-.Os
-.Sh NAME
-.Nm btms
-.Nd Bluetooth mouse support
-.Sh SYNOPSIS
-.Cd "btms*	at bthidev?"
-.Cd "wsmouse*	at btms?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for Bluetooth wireless mice.
-Access to the mouse is through the
-.Xr wscons 4
-driver.
-.Sh SEE ALSO
-.Xr bluetooth 4 ,
-.Xr wsmouse 4
-.Sh HISTORY
-The
-.Nm
-driver appeared in
-.Nx 4.0
-and was written by
-.An Iain Hibbert
-under the sponsorship of Itronix, Inc.
diff --git a/share/man/man4/btsco.4 b/share/man/man4/btsco.4
deleted file mode 100644
index d1c5110a1e5..00000000000
--- a/share/man/man4/btsco.4
+++ /dev/null
@@ -1,132 +0,0 @@
-.\" $OpenBSD: btsco.4,v 1.3 2010/09/19 12:49:37 jmc Exp $
-.\" $NetBSD: btsco.4,v 1.9 2006/10/04 19:29:25 wiz Exp $
-.\"
-.\" Copyright (c) 2006 Itronix Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Iain Hibbert for Itronix Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of Itronix Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific
-.\"    prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: September 19 2010 $
-.Dt BTSCO 4
-.Os
-.Sh NAME
-.Nm btsco
-.Nd Bluetooth SCO Audio
-.Sh SYNOPSIS
-.Cd "btsco*	at bthub?"
-.Cd "audio*	at audiobus?"
-.Sh DESCRIPTION
-.Nm
-provides support for Bluetooth SCO Audio devices through the
-.Xr audio 4
-driver.
-.Nm
-is configured at run time with the
-btdevctl program.
-.Pp
-The following properties are used by
-.Nm
-during autoconfiguration:
-.Bl -tag -width Ds
-.It local-bdaddr
-Local device address.
-.It remote-bdaddr
-Remote device address.
-.It service-name
-.Nm
-matches the
-.Sq HF
-and
-.Sq HSET
-services.
-For the
-.Sq HF
-service, the
-.Nm
-device will, on
-.Xr open 2 ,
-listen for incoming connections from the remote device.
-Otherwise,
-.Nm
-will attempt to initiate a connection to the remote device.
-.It rfcomm-channel
-This integer value is not used directly, but will be stored and
-passed via the
-.Dv BTSCO_INFO
-ioctl as shown below.
-.El
-.Pp
-SCO connections require a baseband connection between the two devices before
-they can be created.
-.Nm
-does not create this, but can provide information to facilitate
-an application setting up a control channel prior to use, via the
-.Dv BTSCO_INFO
-.Xr ioctl 2
-call on the mixer device, which returns a
-.Ar btsco_info
-structure as follows:
-.Bd -literal -offset 3n
-#include <dev/bluetooth/btsco.h>
-
-struct btsco_info {
-	bdaddr_t	laddr;		/* controller bdaddr */
-	bdaddr_t	raddr;		/* headset bdaddr */
-	uint8_t		channel;	/* RFCOMM channel */
-	int		vgs;		/* mixer index speaker */
-	int		vgm;		/* mixer index mic */
-};
-
-#define BTSCO_INFO	_IOR('b', 16, struct btsco_info)
-.Ed
-.Pp
-.Nm
-can be configured to act in Connect or Listen mode.
-In Connect mode,
-it will initiate a connection to the remote device on an
-.Xr open 2
-call, whereas in Listen mode
-.Xr open 2
-will block until the remote device initiates the connection.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr audio 4 ,
-.Xr bluetooth 4
-.Sh HISTORY
-The
-.Nm
-driver
-was written for
-.Nx 4.0
-by
-.An Iain Hibbert
-under the sponsorship of Itronix, Inc.
-.Sh BUGS
-.Nm
-takes no notice of the HCI Voice Setting in the Bluetooth controller,
-and must be 0x0060 (the default)
-as alternate values are currently unsupported.
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 12928dc81c8..69589560f9a 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netintro.4,v 1.45 2014/05/30 07:18:22 guenther Exp $
+.\"	$OpenBSD: netintro.4,v 1.46 2014/07/11 22:10:51 tedu Exp $
 .\"	$NetBSD: netintro.4,v 1.4 1995/10/19 08:03:40 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
 .\"
-.Dd $Mdocdate: May 30 2014 $
+.Dd $Mdocdate: July 11 2014 $
 .Dt NETINTRO 4
 .Os
 .Sh NAME
@@ -502,7 +502,6 @@ from the group
 .Xr ioctl 2 ,
 .Xr socket 2 ,
 .Xr arp 4 ,
-.Xr bluetooth 4 ,
 .Xr bridge 4 ,
 .Xr ifmedia 4 ,
 .Xr inet 4 ,
diff --git a/share/man/man4/sbt.4 b/share/man/man4/sbt.4
deleted file mode 100644
index e2db1091c81..00000000000
--- a/share/man/man4/sbt.4
+++ /dev/null
@@ -1,32 +0,0 @@
-.\"	$OpenBSD: sbt.4,v 1.2 2013/07/16 16:05:49 schwarze Exp $
-.\"
-.\" Uwe Stuehler, 2007. Public Domain.
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt SBT 4
-.Os
-.Sh NAME
-.Nm sbt
-.Nd SDIO Bluetooth adapter
-.Sh SYNOPSIS
-.Cd "sbt* at sdmmc?"
-.Sh DESCRIPTION
-The
-.Nm
-device driver provides support for Type-A and Type-B SDIO Bluetooth
-adapters.
-.Sh SEE ALSO
-.Xr bluetooth 4 ,
-.Xr intro 4 ,
-.Xr sdmmc 4
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Ox 4.2 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-device driver was written by
-.An Uwe Stuehler Aq Mt uwe@openbsd.org .
diff --git a/share/man/man4/sdmmc.4 b/share/man/man4/sdmmc.4
index 00068b70e93..3ffb5ebe662 100644
--- a/share/man/man4/sdmmc.4
+++ b/share/man/man4/sdmmc.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: sdmmc.4,v 1.12 2013/10/16 15:24:36 rapha Exp $
+.\"	$OpenBSD: sdmmc.4,v 1.13 2014/07/11 22:10:51 tedu Exp $
 .\"
 .\" Theo de Raadt, 2006. Public Domain.
 .\"
-.Dd $Mdocdate: October 16 2013 $
+.Dd $Mdocdate: July 11 2014 $
 .Dt SDMMC 4
 .Os
 .Sh NAME
@@ -29,7 +29,6 @@ and
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr rtsx 4 ,
-.Xr sbt 4 ,
 .Xr scsibus 4 ,
 .Xr sd 4 ,
 .Xr sdhc 4
diff --git a/share/man/man4/ubt.4 b/share/man/man4/ubt.4
deleted file mode 100644
index e37be4f6f6a..00000000000
--- a/share/man/man4/ubt.4
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"	$OpenBSD: ubt.4,v 1.6 2013/07/16 16:05:49 schwarze Exp $
-.\"
-.\" Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt UBT 4
-.Os
-.Sh NAME
-.Nm ubt
-.Nd USB Bluetooth adapter
-.Sh SYNOPSIS
-.Cd "ubt* at uhub?"
-.Sh DESCRIPTION
-The
-.Nm
-device driver provides support for USB Bluetooth adapters.
-.Sh SEE ALSO
-.Xr bluetooth 4 ,
-.Xr intro 4 ,
-.Xr netintro 4 ,
-.Xr usb 4
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Ox 3.7 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-device driver was originally ported from
-.Fx
-to
-.Ox
-by
-.An Alexander Yurchenko Aq Mt grange@openbsd.org .
-The current implementation was ported from
-.Nx
-to
-.Ox 4.2
-by
-.An Gordon Willem Klok Aq Mt gwk@openbsd.org .
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index a2376ce04f7..2eeebcbb267 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.154 2014/04/08 01:13:09 brad Exp $
+.\"	$OpenBSD: usb.4,v 1.155 2014/07/11 22:10:51 tedu Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 8 2014 $
+.Dd $Mdocdate: July 11 2014 $
 .Dt USB 4
 .Os
 .Sh NAME
@@ -160,8 +160,6 @@ Ralink Technology USB IEEE 802.11a/b/g wireless network device
 Ralink Technology USB IEEE 802.11a/g/n wireless network device
 .It Xr uath 4
 Atheros USB IEEE 802.11a/b/g wireless network device
-.It Xr ubt 4
-Bluetooth adapters
 .It Xr upgt 4
 Conexant/Intersil PrismGT SoftMAC USB IEEE 802.11b/g wireless network device
 .It Xr ural 4