4 files changed, 74 insertions, 62 deletions
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index 03336f9f8a8..939bd60a18d 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cardbus.4,v 1.51 2006/10/15 20:09:14 deraadt Exp $
+.\" $OpenBSD: cardbus.4,v 1.52 2006/11/16 22:18:18 deraadt Exp $
 .\" $NetBSD: cardbus.4,v 1.4 2000/02/02 19:57:17 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -54,7 +54,20 @@ provides machine-independent bus support and drivers for CardBus devices.
 .Ox
 provides support for the following devices.
 Note that not all architectures support all devices.
-.Ss Network interfaces
+.Ss Wired network interfaces
+.Bl -tag -width 12n -offset ind -compact
+.It Xr dc 4
+DEC/Intel 21140, 21142, 21143, 21145 and clones 10/100 Ethernet device
+.It Xr fxp 4
+Intel EtherExpress PRO/100 10/100 Ethernet device
+.It Xr re 4
+RealTek 8139C+/8169/816xS/811xS/8101E 10/100/Gigabit Ethernet device
+.It Xr rl 4
+Realtek 8129/8139 10/100 Ethernet device
+.It Xr xl 4
+3Com EtherLink XL and Fast EtherLink XL 10/100 Ethernet device
+.El
+.Ss Wireless network interfaces
 .Bl -tag -width 12n -offset ind -compact
 .It Xr acx 4
 TI ACX100/ACX111 IEEE 802.11a/b/g wireless network device
@@ -62,24 +75,14 @@ TI ACX100/ACX111 IEEE 802.11a/b/g wireless network device
 Atheros IEEE 802.11a/b/g wireless network device
 .It Xr atw 4
 ADMtek ADM8211 IEEE 802.11b wireless network device
-.It Xr dc 4
-DEC/Intel 21140, 21142, 21143, 21145 and clones 10/100 Ethernet device
-.It Xr fxp 4
-Intel EtherExpress PRO/100 10/100 Ethernet device
 .It Xr malo 4
 Marvell Libertas IEEE 802.11a/b/g wireless network device
 .It Xr pgt 4
 Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g wireless network device
 .It Xr ral 4
 Ralink Technology IEEE 802.11a/b/g wireless network device
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E 10/100/Gigabit Ethernet device
-.It Xr rl 4
-Realtek 8129/8139 10/100 Ethernet device
 .It Xr rtw 4
 Realtek RTL8180L IEEE 802.11b wireless network device
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL 10/100 Ethernet device
 .El
 .Ss Serial interfaces
 .Bl -tag -width 12n -offset ind -compact
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 54d0925e842..6caffe16253 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.191 2006/11/03 08:47:12 jmc Exp $
+.\"	$OpenBSD: pci.4,v 1.192 2006/11/16 22:18:18 deraadt Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -137,18 +137,10 @@ LSI Logic & Dell MegaRAID SAS RAID controller
 .It Xr twe 4
 3ware 5000/6000/7000/8000 series PATA/SATA RAID controller
 .El
-.Ss Network interfaces
+.Ss Wired network interfaces
 .Bl -tag -width 10n -offset ind -compact
-.It Xr acx 4
-TI ACX100/ACX111 IEEE 802.11a/b/g wireless network device
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network device
 .It Xr art 4
 Accoom Networks Artery T1/E1 network adapters
-.It Xr ath 4
-Atheros IEEE 802.11a/b/g wireless network device
-.It Xr atw 4
-ADMtek ADM8211 IEEE 802.11b wireless network device
 .It Xr bce 4
 Broadcom BCM4401 10/100 Ethernet device
 .It Xr bge 4
@@ -179,12 +171,6 @@ Intel EtherExpress PRO/100 10/100 Ethernet device
 GEM 10/100/Gigabit Ethernet device
 .It Xr hme 4
 Sun Happy Meal 10/100 Ethernet device
-.It Xr ipw 4
-.Tn Intel
-PRO/Wireless 2100 IEEE 802.11b wireless network device
-.It Xr iwi 4
-.Tn Intel
-PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g wireless network device
 .It Xr ixgb 4
 Intel(R) PRO/10GbE 10Gb Ethernet device
 .It Xr lge 4
@@ -193,8 +179,6 @@ Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet device
 Lan Media Corporation
 .Tn SSI/DS1/HSSI/DS3
 interfaces
-.It Xr malo 4
-Marvell Libertas IEEE 802.11a/b/g wireless network device
 .It Xr msk 4
 SysKonnect XMAC II and Marvell Yukon based Gigabit Ethernet device
 .It Xr mtd 4
@@ -207,16 +191,10 @@ NVIDIA nForce MCP 10/100/Gigabit Ethernet device
 National Semiconductor PCI 10/100/Gigabit Ethernet device
 .It Xr pcn 4
 AMD PCnet-PCI 10/100 Ethernet device
-.It Xr pgt 4
-Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g wireless network device
-.It Xr ral 4
-Ralink Technology IEEE 802.11a/b/g wireless network device
 .It Xr re 4
 RealTek 8139C+/8169/816xS/811xS/8101E 10/100/Gigabit Ethernet device
 .It Xr rl 4
 Realtek 8129/8139 10/100 Ethernet device
-.It Xr rtw 4
-Realtek RTL8180L IEEE 802.11b wireless network device
 .It Xr san 4
 Sangoma Technologies AFT T1/E1 Network interfaces
 .It Xr sf 4
@@ -243,15 +221,40 @@ VIA Networking Technologies VT6122 PCI 10/100/Gigabit Ethernet device
 VIA Technologies VT3043, VT86C100A, VT6105/VT6105M 10/100 Ethernet device
 .It Xr wb 4
 Winbond W89C840F 10/100 Ethernet device
+.It Xr xge 4
+Neterion Xframe/Xframe II 10Gb Ethernet device
+.It Xr xl 4
+3Com EtherLink XL and Fast EtherLink XL 10/100 Ethernet device
+.El
+.Ss Wireless network interfaces
+.Bl -tag -width 10n -offset ind -compact
+.It Xr acx 4
+TI ACX100/ACX111 IEEE 802.11a/b/g wireless network device
+.It Xr an 4
+Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network device
+.It Xr ath 4
+Atheros IEEE 802.11a/b/g wireless network device
+.It Xr atw 4
+ADMtek ADM8211 IEEE 802.11b wireless network device
+.It Xr ipw 4
+.Tn Intel
+PRO/Wireless 2100 IEEE 802.11b wireless network device
+.It Xr iwi 4
+.Tn Intel
+PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g wireless network device
+.It Xr malo 4
+Marvell Libertas IEEE 802.11a/b/g wireless network device
+.It Xr pgt 4
+Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g wireless network device
+.It Xr ral 4
+Ralink Technology IEEE 802.11a/b/g wireless network device
+.It Xr rtw 4
+Realtek RTL8180L IEEE 802.11b wireless network device
 .It Xr wi 4
 WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b wireless network
 device
 .It Xr wpi 4
 Intel PRO/Wireless 3945ABG IEEE 802.11a/b/g wireless network device
-.It Xr xge 4
-Neterion Xframe/Xframe II 10Gb Ethernet device
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL 10/100 Ethernet device
 .El
 .Ss Cryptography accelerators
 .Bl -tag -width 10n -offset ind -compact
diff --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4
index 245004f431c..6aeeb54e41c 100644
--- a/share/man/man4/pcmcia.4
+++ b/share/man/man4/pcmcia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcmcia.4,v 1.51 2006/09/21 15:39:50 jmc Exp $
+.\"	$OpenBSD: pcmcia.4,v 1.52 2006/11/16 22:18:18 deraadt Exp $
 .\"	$NetBSD: pcmcia.4,v 1.4 1998/06/07 09:10:30 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -87,29 +87,32 @@ GemPlus GPR400 smartcard reader
 .It Xr com 4 , Xr pccom 4
 serial communications interface
 .El
-.Ss Network interfaces
+.Ss Wired network interfaces
 .Bl -tag -width 12n -offset ind -compact
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network device
-.It Xr awi 4
-BayStack 650 IEEE 802.11FH PCMCIA wireless network device
-.It Xr cnw 4
-Xircom CreditCard Netwave wireless network device
 .It Xr ep 4
 3Com EtherLink III and Fast EtherLink III 10/100 Ethernet device
 .It Xr ne 4
 NE2000 and compatible 10/100 Ethernet device
-.It Xr ray 4
-Raytheon Raylink/WebGear Aviator IEEE 802.11FH wireless network device
 .It Xr rln 4
 Proxim RangeLAN2 wireless network device
 .It Xr sm 4
 SMC91C9x and SMC91C1xx-based 10/100 Ethernet device
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b wireless network device
 .It Xr xe 4
 Xircom-based 16-bit PCMCIA 10/100 Ethernet device
 .El
+.Ss Wireless network interfaces
+.Bl -tag -width 12n -offset ind -compact
+.It Xr an 4
+Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network device
+.It Xr awi 4
+BayStack 650 IEEE 802.11FH PCMCIA wireless network device
+.It Xr cnw 4
+Xircom CreditCard Netwave wireless network device
+.It Xr ray 4
+Raytheon Raylink/WebGear Aviator IEEE 802.11FH wireless network device
+.It Xr wi 4
+WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b wireless network device
+.El
 .Ss SCSI controllers
 .Bl -tag -width 12n -offset ind -compact
 .It Xr aic 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 0d4e78455be..8814be53eea 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.80 2006/10/26 20:13:13 jmc Exp $
+.\"	$OpenBSD: usb.4,v 1.81 2006/11/16 22:18:18 deraadt Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -122,10 +122,8 @@ Note that not all architectures support all devices.
 .Tn USB
 Mass Storage Devices, e.g., external disk drives
 .El
-.Ss Network adapters
+.Ss Wired network interfaces
 .Bl -tag -width 12n -offset ind -compact
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network device
 .It Xr aue 4
 ADMtek AN986/ADM8511 Pegasus family 10/100 USB Ethernet device
 .It Xr axe 4
@@ -136,20 +134,25 @@ USB Communication Device Class Ethernet device
 CATC USB-EL1201A USB Ethernet device
 .It Xr kue 4
 Kawasaki LSI KL5KUSB101B USB Ethernet device
+.It Xr udav 4
+Davicom DM9601 USB Ethernet device
+.It Xr ueagle 4
+Analog Devices Eagle ADSL modems
+.It Xr url 4
+Realtek RTL8150L USB Ethernet device
+.El
+.Ss Wireless network interfaces
+.Bl -tag -width 12n -offset ind -compact
+.It Xr atu 4
+Atmel AT76C50x IEEE 802.11b wireless network device
 .It Xr rum 4
 Ralink Technology USB IEEE 802.11a/b/g 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 udav 4
-Davicom DM9601 USB Ethernet device
-.It Xr ueagle 4
-Analog Devices Eagle ADSL modems
 .It Xr ural 4
 Ralink Technology RT2500 IEEE 802.11a/b/g wireless network device
-.It Xr url 4
-Realtek RTL8150L USB Ethernet device
 .It Xr wi 4
 Intersil PRISM 2-3 IEEE 802.11b wireless network device
 .It Xr zyd 4