for archs where expansion busses are available, point to the bus

page, rather than duplicating the information within that page;

this is really from an idea put forward by theo, and put together
with a lot of help from miod;

ok miod

10 files changed, 165 insertions, 1415 deletions

diff --git a/share/man/man4/man4.alpha/intro.4 b/share/man/man4/man4.alpha/intro.4
index c20ff2652b7..b8c63988bb2 100644
--- a/share/man/man4/man4.alpha/intro.4
+++ b/share/man/man4/man4.alpha/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.35 2006/07/06 14:43:50 jmc Exp $
+.\"     $OpenBSD: intro.4,v 1.36 2006/09/08 09:25:53 jmc Exp $
 .\"     $NetBSD: intro.4,v 1.10 2003/05/06 07:44:54 wiz Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
@@ -380,153 +380,22 @@ Tsunami-based systems.
 .Pc
 .El
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width 12n -compact -offset ind
-.It Xr adv 4
-AdvanSys PCI narrow SCSI Host Adapters.
-.It Xr adw 4
-AdvanSys PCI wide SCSI Host Adapters.
-.It Xr ahc 4
-Adaptec 2xxx and 3xxx series PCI/VLB/EISA SCSI adapter boards.
-.It Xr aic 4
-Adaptec AIC-6260, Adaptec AIC-6360, Adaptec 152x, and SoundBlaster SCSI boards.
-.It Xr ami 4
-American Megatrends Inc.
-MegaRAID Controllers.
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network adapters.
-.It Xr asc 4
-NCR 53c[f]94 on-board or TURBOchannel SCSI controller.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr axe 4
-ASIX Electronics AX88172/AX88178 USB Ethernet adapters.
-.It Xr bge 4
-Broadcom BCM570x (Tigon3) Gigabit Ethernet boards.
-.It Xr cmpci 4
-C-Media CMI8x38 audio.
-.It Xr com 4
-NS8250-, NS16450-, NS16550-, ST16550- and TI16750-based asynchronous
-serial communications.
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.It Xr cy 4
-Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial adapters.
-.It Xr dc 4
-DEC tulip clone Ethernet cards (Macronix, Lite-On, Davicom, ADMtek).
-.It Xr de 4
-DEC tulip-based Ethernet cards.
-.It Xr dpt 4
-DPT SmartCache/SmartRAID III and IV SCSI controllers.
-.It Xr eap 4
-Ensoniq AudioPCI (ES137x) audio.
-.It Xr ec 4
-3Com EtherLink II Ethernet (3C503).
-.It Xr em 4
-Intel PRO/1000 Ethernet driver.
-.It Xr ep 4
-3Com EtherLink III Ethernet (3C5x9, 3C59x).
-.It Xr epic 4
-SMC 83C170 (EPIC) 10/100 Mbps Ethernet cards.
-.It Xr eso 4
-ESS Technology Solo-1 PCI AudioDrive (ES1938/ES1946) audio.
-.It Xr fea 4
-.Tn DEC
-DEFEA PCI FDDI controller.
-.It Xr fms 4
-Forte Media FM801 audio.
-.It Xr fpa 4
-.Tn DEC
-DEFPA PCI FDDI controller.
-.It Xr fxp 4
-.Tn Intel
-EtherExpress PRO/100 Ethernet.
-.It Xr gdt 4
-ICP-Vortex GDT RAID controllers.
-.It Xr hifn 4
-Hi/Fn 7751 Encryption Accelerator.
-.It Xr ises 4
-Securealink PCC-ISES hardware crypto accelerator.
-.It Xr isp 4
-QLogic PCI SCSI controllers.
-.It Xr lc 4
-DEC EtherWORKS III Ethernet interfaces.
-.It Xr le 4
-AMD LANCE Ethernet.
-.It Xr lmc 4
-Lan Media Corporation SS1/DS1/HSSI/DS3 PCI WAN adapters.
-.It Xr lpt 4
-Parallel port.
-.It Xr ne 4
-Novell NE1000 and 2000 Ethernet interface.
-.It Xr pckbc 4
-Traditional PC (ISA) keyboard.
-.It Xr pms 4
-PS/2 auxiliary port mouse, for generic mice.
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E Ethernet adapter driver.
-.It Xr rl 4
-Realtek 8129/8139 Ethernet.
-.It Xr sf 4
-Adaptec AIC-6915 Starfire PCI Fast Ethernet.
-.It Xr siop 4
-LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
-.It Xr sis 4
-SiS 900, Sis 7016 and NS DP83815 Fast Ethernet.
-.It Xr sk 4
-SysKonnect 984x Gigabit Ethernet (9841/9842/9843/9844).
-.It Xr speaker 4
-Console speaker.
-.It Xr stge 4
-Sundance/Tamarack TC9021 Gigabit Ethernet.
-.It Xr ti 4
-Alteon Tigon I & II Gigabit Ethernet (3Com 3C985, Netgear GA620, etc).
-.It Xr tl 4
-Texas Instruments ThunderLAN Ethernet.
-.It Xr twe 4
-3ware Escalade RAID controller.
-.It Xr txp 4
-3Com 3XP Typhoon/Sidewinder (3CR990) Ethernet.
-.It Xr ubsec 4
-Broadcom Bluesteelnet uBsec 5501, 5601, 5805, and 5820.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr uftdi 4
-FTDI FT8U100AX-based USB serial adapters.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-I/O Data USB-RSAQ2 USB serial adapters.
-.It Xr ural 4
-Ralink Technology RT2500 USB 2.0 IEEE 802.11a/b/g wireless network adapters.
-.It Xr urio 4
-Diamond Multimedia Rio MP3 device interface.
-.It Xr uvisor 4
-Handspring Visor device interface.
-.\" .It Xr uyap 4
-.\" YAP phone firmware interface.
-.It Xr vga 4
-PC display adapter driver for VGA compatible adapters.
-.It Xr vr 4
-VIA Rhine Ethernet.
-.It Xr wb 4
-Winbond W89C840F Fast Ethernet.
-.It Xr wdc 4
-Standard ISA Western Digital type hard drive controllers.
-MFM, RLL, ESDI, and IDE.
-.It Xr we 4
-Western Digital/SMC WD 80x3, SMC Elite Ultra and SMC EtherEZ Ethernet cards.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.It Xr wss 4
-Windows Sound System audio.
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL (3c9xx).
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr eisa 4
+introduction to EISA bus support
+.It Xr isa 4
+introduction to ISA bus support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.amd64/intro.4 b/share/man/man4/man4.amd64/intro.4
index ad38aa10a57..5247369b6ef 100644
--- a/share/man/man4/man4.amd64/intro.4
+++ b/share/man/man4/man4.amd64/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.27 2006/07/06 14:43:50 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.28 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -87,342 +87,29 @@ the system will have to be rebooted.
 .Pp
 The autoconfiguration system is described in
 .Xr autoconf 4 .
-A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width pcdisplay(4) -compact -offset indent
-.\" .It Xr aac 4
-.\" Adaptec "FSA" family (Adaptec AAC, Dell PERC, HP NetRaid) RAID controllers.
-.\" .It Xr addcom 4
-.\" Addonics FlexPort serial boards.
-.\" .It Xr adv 4
-.\" AdvanSys PCI narrow SCSI Host Adapters.
-.\" .It Xr adw 4
-.\" AdvanSys PCI wide SCSI Host Adapters.
-.\" .It Xr aha 4
-.\" Adaptec 154x ISA SCSI adapter boards.
-.\" .It Xr ahb 4
-.\" Adaptec 1742 EISA SCSI adapter boards.
-.It Xr ahc 4
-Adaptec 2xxx and 3xxx series PCI/VLB/EISA SCSI adapter boards.
-.\" .It Xr aic 4
-.\" Adaptec AIC-6260, Adaptec AIC-6360, Adaptec 152x, and SoundBlaster SCSI boards.
-.\" .It Xr amdpm 4
-.\" AMD-756/766/768/8111 Power Management controller.
-.\" .It Xr ami 4
-.\" American Megatrends Inc. MegaRAID Controllers.
-.\" .It Xr an 4
-.\" Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network adapters.
-.\" .It Xr apm 4
-.\" Advanced Power Management.
-.\" .It Xr aria 4
-.\" Sierra Semiconductor Aria 16 sound cards.
-.\" .It Xr ast 4
-.\" Multiplexing serial communications card first made by AST.
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.\" .It Xr auich 4
-.\" Intel 82801AA/AB/BA and 440MX PCI audio.
-.It Xr auixp 4
-ATI IXP series integrated AC'97 audio devices.
-.It Xr auvia 4
-VIA VT82C686A and VT8233 integrated AC'97 audio device.
-.\" .It Xr awi 4
-.\" BayStack 650 PCMCIA wireless network adapter.
-.It Xr axe 4
-ASIX Electronics AX88172/AX88178 USB Ethernet adapters.
-.\" .It Xr az 4
-.\" Aztech/PackardBell FM Radio card.
-.It Xr bge 4
-Broadcom BCM570x (Tigon3) Gigabit Ethernet boards.
-.\" .It Xr bha 4
-.\" Buslogic BT-445, BT-74x, and BT-9xx SCSI boards.
-.\" .It Xr bktr 4
-.\" Brooktree video capture.
-.\" .It Xr boca 4
-.\" BOCA serial cards.
-.\" .It Xr cac 4
-.\" Compaq Smart ARRAY RAID controllers.
-.It Xr ciss 4
-Compaq Smart ARRAY 5* and 6* controllers.
-.\" .It Xr clcs 4
-.\" Cirrus Logic CS4280 audio.
-.\" .It Xr clct 4
-.\" Cirrus Logic CS4281 audio.
-.\" .It Xr cmpci 4
-.\" C-Media CMI8x38 audio.
-.\" .It Xr cnw 4
-.\" Xircom CreditCard Netwave wireless network adapter.
-.It Xr com 4
-NS8250-, NS16450-, NS16550-, ST16550-, TI16750- and XR16850-based asynchronous
-serial communications.
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.\" .It Xr cy 4
-.\" Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial adapters.
-.\" .It Xr cz 4
-.\" Cyclades Cyclades-Z asynchronous serial adapters.
-.It Xr dc 4
-DEC tulip clone Ethernet cards (Macronix, Lite-On, Davicom, ADMtek).
-.\" .It Xr de 4
-.\" DEC tulip-based Ethernet cards.
-.\" .It Xr dpt 4
-.\" DPT SmartCache/SmartRAID III and IV SCSI controllers.
-.\" .It Xr eap 4
-.\" Ensoniq AudioPCI (ES137x) audio.
-.\" .It Xr ec 4
-.\" 3Com EtherLink II Ethernet (3C503).
-.\" .It Xr ef 4
-.\" 3Com Fast EtherLink ISA Ethernet (3C515).
-.\" .It Xr eg 4
-.\" 3Com EtherLink Plus Ethernet (3C505).
-.\" .It Xr el 4
-.\" 3Com EtherLink Ethernet (3C501).
-.\" .It Xr elansc 4
-.\" AMD Elan SC520 System Controller.
-.It Xr em 4
-Intel PRO/1000 Ethernet driver.
-.\" .It Xr emu 4
-.\" Creative Labs SBLive!, PCI 512, and Audigy audio.
-.\" .It Xr ep 4
-.\" 3Com EtherLink III Ethernet (3C5x9, 3C59x).
-.\".It Xr epic 4
-.\" SMC 83C170 (EPIC) 10/100 Mbps Ethernet cards.
-.\" .It Xr esa 4
-.\" ESS Alegro 1 and Maestro 3 audio.
-.\" .It Xr eso 4
-.\" ESS Technology Solo-1 PCI AudioDrive (ES1938/ES1946) audio.
-.\" .It Xr ess 4
-.\" ESS Technology AudioDrive (ESS 1788, 1888, 1887 and 888) audio.
-.\" .It Xr ex 4
-.\" Intel EtherExpress PRO/10 Ethernet cards.
-.\" .It Xr fdc 4
-.\" Floppy disk controllers.
-.\" .It Xr fea 4
-.\" .Tn DEC
-.\" DEFEA PCI FDDI controller.
-.\" .It Xr fms 4
-.\" Forte Media FM801 audio.
-.\" .It Xr fpa 4
-.\" .Tn DEC
-.\" DEFPA PCI FDDI controller.
-.It Xr fxp 4
-.Tn Intel
-EtherExpress PRO/100 Ethernet.
-.It Xr gdt 4
-ICP-Vortex GDT RAID controllers.
-.\" .It Xr geodesc 4
-.\" Geode SC1100 System Controller.
-.\" .It Xr gtp 4
-.\" Gemtek PCI FM radio adapter.
-.\" .It Xr gus 4
-.\" Gravis UltraSound and UltraSound/MAX audio.
-.It Xr hifn 4
-Hifn 7751 crypto accelerator.
-.\" .It Xr hsq 4
-.\" Hostess multiplexing serial communications boards.
-.\" .It Xr ie 4
-.\" StarLAN 10, EN100, StarLan Fiber, and 3Com 3c507 Ethernet.
-.\" .It Xr iha 4
-.\" Initio INIC-940 and INIC-950 based SCSI interfaces.
-.\" .It Xr iop 4
-.\" I2O adapter.
-.It Xr ises 4
-Securealink PCC-ISES hardware crypto accelerator.
-.\" .It Xr isp 4
-.\" QLogic PCI SCSI controllers.
-.It Xr it 4
-ITE IT8705F, IT8712F and SiS SiS950 hardware monitors.
-.\" .It Xr joy 4
-.\" Joystick.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
-.\" .It Xr lc 4
-.\" .Tn DEC
-.\" EtherWORKS III Ethernet.
-.\" .It Xr lge 4
-.\" Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet.
-.\" .It Xr lmc 4
-.\" Lan Media Corporation SS1/DS1/HSSI/DS3 PCI WAN adapters.
-.\" .It Xr lms 4
-.\" Logitech-style bus mouse.
-.It Xr lofn 4
-Hifn 6500 crypto accelerator.
-.\" .It Xr lpt 4
-.\" Parallel port.
-.\".It Xr maestro 4
-.\"ESS Maestro 1, 2 and 2E audio.
-.\".It Xr mcd 4
-.\"Mitsumi CD-ROM drives.
-.\".It Xr mms 4
-.\"Microsoft-style bus mouse.
-.\".It Xr ne 4
-.\"Novell NE1000 and 2000 Ethernet interface.
-.\".It Xr neo 4
-.\"NeoMagic 256AV/ZX audio.
-.It Xr nfe 4
-NVIDIA nForce MCP Ethernet.
-.\".It Xr nge 4
-.\"National Semiconductor PCI Gigabit Ethernet.
-.It Xr nofn 4
-Hifn 7814/7851/7854 HIPP1 crypto processor.
-.\".It Xr npx 4
-.\"Numeric Processing Extension coprocessor and emulator.
-.It Xr nsclpcsio 4
-National Semiconductor PC87366 LPC Super I/O.
-.\".It Xr opl 4
-.\"Yamaha OPL2 and OPL3 FM synthesizer.
-.\".It Xr pas 4
-.\"ProAudio spectrum audio.
-.\".It Xr pcdisplay 4
-.\"PC display adapter driver for MDA or CGA compatible adapters.
-.It Xr pckbc 4
-Traditional PC (ISA) keyboard.
-.\".It Xr pctr 4
-.\"CPU performance counter registers.
-.It Xr pms 4
-PS/2 auxiliary port mouse, for generic mice.
-.It Xr pmsi 4
-PS/2 auxiliary port mouse, for wheel mice.
-.\".It Xr pss 4
-.\"Personal Sound System audio.
-.\".It Xr puc 4
-.\"PCI ``universal'' communications card driver.
-.\".It Xr ray 4
-.\"Raytheon Raylink/WebGear Aviator wireless network adapter.
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E Ethernet adapter driver.
-.\".It Xr rl 4
-.\"Realtek 8129/8139 Ethernet.
-.\".It Xr rt 4
-.\"AIMS Lab Radiotrack FM radio adapter.
-.\".It Xr rtfps 4
-.\"Another multiplexing serial communications card.
-.It Xr safe 4
-Safenet SafeXcel 1141/1741 crypto accelerator.
-.\".It Xr sb 4
-.\"Sound Blaster card.
-.\".It Xr sea 4
-.\"Seagate/Future Domain SCSI cards.
-.\".It Xr sf 4
-.\"Adaptec AIC-6915 Starfire PCI Fast Ethernet.
-.\".It Xr sf2r 4
-.\"SoundForte RadioLink SF16-FMR2 FM radio adapter.
-.\".It Xr sf4r 4
-.\"SoundForte RadioLink SF64-PCR FM radio adapter.
-.\".It Xr sfr 4
-.\"SoundForte RadioLink SF16-FMR FM radio adapter.
-.\".It Xr siop 4
-.\"LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
-.It Xr sis 4
-SiS 900, Sis 7016 and NS DP83815 Fast Ethernet.
-.It Xr sk 4
-SysKonnect 984x Gigabit Ethernet (9841/9842/9843/9844).
-.It Xr sm 4
-SMC91C9x and SMC91C1xx-based Ethernet.
-.\".It Xr speaker 4
-.\"Console speaker.
-.\".It Xr ste 4
-.\"Sundance Technologies ST201 Fast Ethernet.
-.It Xr stge 4
-Sundance/Tamarack TC9021 Gigabit Ethernet.
-.\".It Xr sv 4
-.\"S3 SonicVibes cards.
-.\".It Xr tcic 4
-.\"Databook PCMCIA controllers.
-.It Xr ti 4
-Alteon Tigon I & II Gigabit Ethernet (3Com 3C985, Netgear GA620, etc).
-.\".It Xr tl 4
-.\"Texas Instruments ThunderLAN Ethernet.
-.\".It Xr tr 4
-.\"IBM TROPIC Token-Ring adapters.
-.\".It Xr trm 4
-.\"TRM-S1040 based PCI SCSI Host Adapters.
-.It Xr twe 4
-3ware Escalade RAID controller.
-.It Xr txp 4
-3Com 3XP Typhoon/Sidewinder (3CR990) Ethernet.
-.It Xr uaudio 4
-USB audio devices.
-.It Xr ubsec 4
-Broadcom Bluesteelnet uBsec 5501, 5601, 5805, and 5820.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr udsbr 4
-D-Link DSB-R100 USB radio adapter.
-.It Xr uftdi 4
-FTDI FT8U100AX-based USB serial adapters.
-.\".It Xr uha 4
-.\"Ultrastor ISA and EISA SCSI adapter cards.
-.It Xr ukbd 4
-USB keyboard.
-.It Xr ulpt 4
-USB printers.
-.It Xr umass 4
-USB mass storage.
-.It Xr umct 4
-MCT USB-RS232 serial adapter.
-.It Xr umidi 4
-USB MIDI devices.
-.It Xr umodem 4
-USB modems.
-.It Xr ums 4
-USB mouse.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-I/O Data USB-RSAQ2 USB serial adapters.
-.\".It Xr urio 4
-.\"Diamond Multimedia Rio MP3 device interface.
-.It Xr url 4
-Realtek RTL8150L USB Ethernet adapter.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-SCSI-over-USB scanners.
-.It Xr uvisor 4
-Handspring Visor device interface.
-.It Xr uyap 4
-YAP phone firmware interface.
-.It Xr vga 4
-PC display adapter driver for VGA compatible adapters.
-.It Xr vge 4
-VIA VT6122 Gigabit Ethernet.
-.It Xr vr 4
-VIA Rhine Ethernet.
-.\".It Xr wb 4
-.\"Winbond W89C840F Fast Ethernet.
-.\".It Xr wdc 4
-.\"Standard ISA Western Digital type hard drive controllers.
-.\"MFM, RLL, ESDI, and IDE.
-.\".It Xr wds 4
-.\"WD-7000 SCSI host adapters.
-.\".It Xr wdt 4
-.\"Industrial Computer Source PCI-WDT50x watchdog timer cards.
-.\".It Xr we 4
-.\"Western Digital/SMC WD 80x3, SMC Elite Ultra and SMC EtherEZ Ethernet cards.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.\".It Xr wss 4
-.\"Windows Sound System audio.
-.\".It Xr wt 4
-.\"Wangtek and compatible tape drives.
-.\"QIC-02 and QIC-36.
-.\".It Xr xe 4
-.\"Xircom PCMCIA Ethernet.
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL (3c9xx).
-.\".It Xr yds 4
-.\"Yamaha DS-XG audio.
-.\".It Xr ym 4
-.\"Yamaha OPL3-SAx audio.
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr cardbus 4
+introduction to CardBus support
+.It Xr eisa 4
+introduction to EISA bus support
+.It Xr isa 4
+introduction to ISA bus support
+.It Xr isapnp 4
+introduction to ISA Plug-and-Play support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.armish/intro.4 b/share/man/man4/man4.armish/intro.4
index 215c8aad406..cb82edabf22 100644
--- a/share/man/man4/man4.armish/intro.4
+++ b/share/man/man4/man4.armish/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.1 2006/06/06 00:01:49 drahn Exp $
+.\"	$OpenBSD: intro.4,v 1.2 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -89,86 +89,18 @@ The autoconfiguration system is described in
 .Xr autoconf 4 .
 A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-.\" Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width lotsofletters -compact -offset indent
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr axe 4
-ASIX Electronics AX88172/AX88178 USB Ethernet adapters.
-.It Xr cd 4
-ATAPI or SCSI CD drives.
-.It Xr cdce 4
-USB Communication Device Class Ethernet adapters.
-.It Xr com 4
-NS16550-compatible asynchronous serial ports.
-.\" cpu
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
-.It Xr ohci 4
-USB host controller.
-.It Xr sd 4
-SCSI disks.
-.It Xr uaudio 4
-USB audio devices.
-.It Xr ubsa 4
-USB Belkin serial adapter.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr udsbr 4
-D-Link DSB-R100 radio.
-.It Xr uftdi 4
-USB FTDI FT8U100AX serial adapters.
-.It Xr uhid 4
-USB human interface devices.
-.It Xr uhub 4
-USB hubs.
-.It Xr ukbd 4
-USB keyboards.
-.It Xr ulpt 4
-USB printers..
-.It Xr umass 4
-USB mass storage.
-.It Xr umct 4
-USB MCT RS232 serial adapters.
-.It Xr umidi 4
-USB MIDI devices.
-.It Xr umodem 4
-USB modems.
-.It Xr ums 4
-USB mouses.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-USB Prolific PL2303 serial adapters.
-.It Xr ural 4
-Ralink Technology RT2500 USB 2.0 IEEE 802.11a/b/g wireless network adapters.
-.It Xr urio 4
-Diamond Multimedia Rio 500.
-.It Xr url 4
-Realtek RTL8150L USB Ethernet adapters.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-USB SCSI scanners.
-.It Xr uvisor 4
-Handspring Visor.
-.It Xr uvscom 4
-USB SUNTAC Slipper U VS-10U serial adapter.
-.It Xr wd 4
-IDE disks.
-.It Xr wdc 4
-IDE disk controller.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.cats/intro.4 b/share/man/man4/man4.cats/intro.4
index 9a6fa877b6b..99a708575f5 100644
--- a/share/man/man4/man4.cats/intro.4
+++ b/share/man/man4/man4.cats/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.6 2006/07/06 14:43:50 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.7 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -87,101 +87,21 @@ the system will have to be rebooted.
 .Pp
 The autoconfiguration system is described in
 .Xr autoconf 4 .
-A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width pcdisplay(4) -compact -offset indent
-.It Xr adv 4
-AdvanSys PCI narrow SCSI Host Adapters.
-.It Xr ahc 4
-Adaptec 2xxx and 3xxx series PCI/VLB/EISA SCSI adapter boards.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr com 4
-NS8250-, NS16450-, NS16550-, ST16550-, TI16750- and XR16850-based asynchronous
-serial communications.
-.\" cpu
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.It Xr dc 4
-DEC tulip clone Ethernet cards (Macronix, Lite-On, Davicom, ADMtek).
-.It Xr de 4
-DEC tulip-based Ethernet cards.
-.\" ds1687rtc
-.It Xr em 4
-Intel PRO/1000 Ethernet driver.
-.It Xr ep 4
-3Com EtherLink III Ethernet (3C5x9, 3C59x).
-.\" fcom
-.It Xr footbridge 4
-DC21285 PCI bridge.
-.It Xr fxp 4
-.Tn Intel
-EtherExpress PRO/100 Ethernet.
-.It Xr iha 4
-Initio INIC-940 and INIC-950 based SCSI interfaces.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
-.It Xr lpt 4
-Parallel port.
-.It Xr ne 4
-Novell NE1000 and 2000 Ethernet interface.
-.It Xr pckbc 4
-Traditional PC (ISA) keyboard.
-.It Xr pcscp 4
-Advanced Micro Devices Am53c974 PCscsi-PCI SCSI driver.
-.It Xr pms 4
-PS/2 auxiliary port mouse, for generic mice.
-.\" .It Xr pmsi 4
-.\" PS/2 auxiliary port mouse, for wheel mice.
-.It Xr siop 4
-LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
-.\" todclock
-.It Xr uaudio 4
-USB audio devices.
-.It Xr uftdi 4
-FTDI FT8U100AX-based USB serial adapters.
-.It Xr ukbd 4
-USB keyboard.
-.It Xr ulpt 4
-USB printers.
-.It Xr umass 4
-USB mass storage.
-.It Xr umct 4
-MCT USB-RS232 serial adapter.
-.It Xr umidi 4
-USB MIDI devices.
-.It Xr umodem 4
-USB modems.
-.It Xr ums 4
-USB mouse.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-I/O Data USB-RSAQ2 USB serial adapters.
-.It Xr urio 4
-Diamond Multimedia Rio MP3 device interface.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-SCSI-over-USB scanners.
-.It Xr uvisor 4
-Handspring Visor device interface.
-.It Xr uyap 4
-YAP phone firmware interface.
-.It Xr vga 4
-PC display adapter driver for VGA compatible adapters.
-.It Xr vr 4
-VIA Rhine Ethernet.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL (3c9xx).
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr isa 4
+introduction to ISA bus support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.hppa/intro.4 b/share/man/man4/man4.hppa/intro.4
index 9a38b049d9d..a14cec4099d 100644
--- a/share/man/man4/man4.hppa/intro.4
+++ b/share/man/man4/man4.hppa/intro.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.4,v 1.12 2005/06/22 14:03:30 martin Exp $
+.\" $OpenBSD: intro.4,v 1.13 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 2002,2003 Paul Weissmann
 .\" All rights reserved.
@@ -153,81 +153,26 @@ system characteristics.
 .It "C360" Ta "360" Ta "8500" Ta "512/1024" Ta "GSC/PCI/EISA, 3 GSC/PCI"
 .El
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
-.Bl -tag -width phantomasXXX
-.It Xr asp 4
-The ASP I/O controller; found in most of the older machines which
-don't have LASI or WAX.
-Includes GSC-bus controller, to which most of the devices are attached.
-Most of I/O is still on external chips though.
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network adapters.
-.It Xr com 4
-The RS-232 ports.
-.It Xr cpu 4
-The Central Processor itself, makes sure the machine does something useful.
-.It Xr dc 4
-.Tn DEC/Intel 21140, 21143, 21145
-and clone 10/100 Ethernet controller.
-.It Xr dino 4
-The
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
 .Xr pci 4
-bridge on most of the newer systems.
-.It Xr harmony 4
-CS4215/AD1849 audio.
+man page.
+The following busses and controllers list these devices:
+.Pp
+.Bl -tag -width "cardbus(4)XX" -offset ind -compact
+.It Xr cardbus 4
+introduction to CardBus support
+.It Xr gsc 4
+HP 9000/700 General System Connect bus
 .It Xr hil 4
-Human Interface Loop, sporting several input devices,
-e.g. keyboards, mice, tablets and such.
-.It Xr ie 4
-.Tn i82596 CA/DX
-LAN controller.
-Found in every 700, either included in the MBA
-or on an external chip on mainboard.
-.It Xr lasi 4
-LSI?, found in almost all
-.Tn HP 9000/700
-workstations.
-Integrates most of the bus and I/O functions into one chip.
-.It Xr lpt 4
-The Centronics printer port.
-.It Xr mem 4
-Memory files and memory controller.
-.It Xr mongoose 4
-The
-.Xr eisa 4
-bus controller on most of the older 700 machines.
-.It Xr oosiop 4
-.Tn Symbios/NCR
-53C700 SCSI I/O processor.
-.It Xr osiop 4
-.Tn Symbios/NCR
-53C710 SCSI I/O processor.
-.It Xr pdc 4
-The PROM interface, allows to call the routines in the machine's
-PROM for things like initial console output and such.
-.It Xr phantomas 4
-Phantom PseudoBC GSC+ Port.
-.It Xr power 4
-The power button interface allowing graceful shutdown of the
-system should being depressed on the running system.
-.It Xr uturn 4
-U2/Uturn, Runway to GSC Bus bridge & IOA.
-.It Xr siop 4
-.Tn LSI/Symbios Logic/NCR
-53C8xx SCSI I/O processor.
-.It Xr sti 4
-The system graphics driver.
-.It Xr wax 4
-The other reincarnation of
-.Xr lasi 4
-used for cheap
-.Tn ASIC
-implementations for add-on devices.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
+introduction to HP-HIL support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.i386/intro.4 b/share/man/man4/man4.i386/intro.4
index ec3c11d5e73..1f11a9f13af 100644
--- a/share/man/man4/man4.i386/intro.4
+++ b/share/man/man4/man4.i386/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.75 2006/07/06 14:43:50 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.76 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -88,364 +88,29 @@ the system will have to be rebooted.
 .Pp
 The autoconfiguration system is described in
 .Xr autoconf 4 .
-A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width pcdisplay(4) -compact -offset indent
-.It Xr aac 4
-Adaptec "FSA" family (Adaptec AAC, Dell PERC, HP NetRaid) RAID controllers.
-.It Xr addcom 4
-Addonics FlexPort serial boards.
-.It Xr adv 4
-AdvanSys PCI narrow SCSI Host Adapters.
-.It Xr adw 4
-AdvanSys PCI wide SCSI Host Adapters.
-.It Xr aha 4
-Adaptec 154x ISA SCSI adapter boards.
-.It Xr ahb 4
-Adaptec 1742 EISA SCSI adapter boards.
-.It Xr ahc 4
-Adaptec 2xxx and 3xxx series PCI/VLB/EISA SCSI adapter boards.
-.It Xr aic 4
-Adaptec AIC-6260, Adaptec AIC-6360, Adaptec 152x, and SoundBlaster SCSI boards.
-.It Xr amdpm 4
-AMD-756/766/768/8111 Power Management controller.
-.It Xr ami 4
-American Megatrends Inc. MegaRAID Controllers.
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network adapters.
-.It Xr apm 4
-Advanced Power Management.
-.It Xr aps 4
-ThinkPad Active Protection System hardware monitors.
-.It Xr aria 4
-Sierra Semiconductor Aria 16 sound cards.
-.It Xr ast 4
-Multiplexing serial communications card first made by AST.
-.It Xr ath 4
-Atheros IEEE 802.11a/b/g wireless network adapters.
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr atw 4
-ADMtek ADM8211 IEEE 802.11b wireless network interfaces.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr auich 4
-Intel 82801AA/AB/BA and 440MX PCI audio.
-.It Xr auixp 4
-ATI IXP series integrated AC'97 audio devices.
-.It Xr auvia 4
-VIA VT82C686A and VT8233 integrated AC'97 audio device.
-.It Xr awi 4
-BayStack 650 IEEE 802.11FH PCMCIA wireless network adapters.
-.It Xr axe 4
-ASIX Electronics AX88172/AX88178 USB Ethernet adapters.
-.It Xr az 4
-Aztech/PackardBell FM Radio card.
-.It Xr bce 4
-Broadcom BCM4401 Ethernet.
-.It Xr bge 4
-Broadcom BCM570x (Tigon3) Gigabit Ethernet boards.
-.It Xr bha 4
-Buslogic BT-445, BT-74x, and BT-9xx SCSI boards.
-.It Xr bktr 4
-Brooktree video capture.
-.It Xr boca 4
-BOCA serial cards.
-.It Xr cac 4
-Compaq Smart ARRAY RAID controllers.
-.It Xr ciss 4
-Compaq Smart ARRAY 5* and 6* controllers.
-.It Xr clcs 4
-Cirrus Logic CS4280 audio.
-.It Xr clct 4
-Cirrus Logic CS4281 audio.
-.It Xr cmpci 4
-C-Media CMI8x38 audio.
-.It Xr cnw 4
-Xircom CreditCard Netwave wireless network adapter.
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.It Xr cy 4
-Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial adapters.
-.It Xr cz 4
-Cyclades Cyclades-Z asynchronous serial adapters.
-.It Xr dc 4
-DEC tulip clone Ethernet cards (Macronix, Lite-On, Davicom, ADMtek).
-.It Xr de 4
-DEC tulip-based Ethernet cards.
-.It Xr dpt 4
-DPT SmartCache/SmartRAID III and IV SCSI controllers.
-.It Xr eap 4
-Ensoniq AudioPCI (ES137x) audio.
-.It Xr ec 4
-3Com EtherLink II Ethernet (3C503).
-.It Xr ef 4
-3Com Fast EtherLink ISA Ethernet (3C515).
-.It Xr eg 4
-3Com EtherLink Plus Ethernet (3C505).
-.It Xr el 4
-3Com EtherLink Ethernet (3C501).
-.It Xr elansc 4
-AMD Elan SC520 System Controller.
-.It Xr em 4
-Intel PRO/1000 Ethernet driver.
-.It Xr emu 4
-Creative Labs SBLive!, PCI 512, and Audigy audio.
-.It Xr ep 4
-3Com EtherLink III Ethernet (3C5x9, 3C59x).
-.It Xr epic 4
-SMC 83C170 (EPIC/100) Ethernet driver.
-.It Xr esa 4
-ESS Alegro 1 and Maestro 3 audio.
-.It Xr eso 4
-ESS Technology Solo-1 PCI AudioDrive (ES1938/ES1946) audio.
-.It Xr ess 4
-ESS Technology AudioDrive (ESS 1788, 1888, 1887 and 888) audio.
-.It Xr ex 4
-Intel EtherExpress PRO/10 Ethernet cards.
-.It Xr fdc 4
-Floppy disk controllers.
-.It Xr fea 4
-.Tn DEC
-DEFEA PCI FDDI controller.
-.It Xr fms 4
-Forte Media FM801 audio.
-.It Xr fpa 4
-.Tn DEC
-DEFPA PCI FDDI controller.
-.It Xr fxp 4
-.Tn Intel
-EtherExpress PRO/100 Ethernet.
-.It Xr gdt 4
-ICP-Vortex GDT RAID controllers.
-.It Xr geodesc 4
-Geode SC1100 System Controller.
-.It Xr gtp 4
-Gemtek PCI FM radio adapter.
-.It Xr gus 4
-Gravis UltraSound and UltraSound/MAX audio.
-.It Xr hifn 4
-Hifn 7751 crypto accelerator.
-.It Xr hsq 4
-Hostess multiplexing serial communications boards.
-.It Xr ichwdt 4
-Intel 6300ESB ICH watchdog timer driver.
-.It Xr ie 4
-StarLAN 10, EN100, StarLan Fiber, and 3Com 3c507 Ethernet.
-.It Xr iha 4
-Initio INIC-940 and INIC-950 based SCSI interfaces.
-.It Xr iop 4
-I2O adapter.
-.It Xr ipw 4
-Intel PRO/Wireless 2100 IEEE 802.11b wireless network adapters.
-.It Xr iwi 4
-Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g wireless network adapters.
-.It Xr ises 4
-Securealink PCC-ISES hardware crypto accelerator.
-.It Xr isp 4
-QLogic PCI SCSI controllers.
-.It Xr it 4
-ITE IT8705F, IT8712F and SiS SiS950 hardware monitors.
-.It Xr joy 4
-Joystick.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
-.It Xr lc 4
-.Tn DEC
-EtherWORKS III Ethernet.
-.It Xr le 4
-BICC Isolan, Novell NE2100, and Digital DEPCA Ethernet.
-.It Xr lge 4
-Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet.
-.It Xr lmc 4
-Lan Media Corporation SS1/DS1/HSSI/DS3 PCI WAN adapters.
-.It Xr lms 4
-Logitech-style bus mouse.
-.It Xr lofn 4
-Hifn 6500 crypto accelerator.
-.It Xr lpt 4
-Parallel port.
-.It Xr maestro 4
-ESS Maestro 1, 2 and 2E audio.
-.It Xr mcd 4
-Mitsumi CD-ROM drives.
-.It Xr mms 4
-Microsoft-style bus mouse.
-.It Xr nsclpcsio 4
-National Semiconductor PC87366 LPC Super I/O.
-.It Xr ne 4
-Novell NE1000 and 2000 Ethernet interface.
-.It Xr neo 4
-NeoMagic 256AV/ZX audio.
-.It Xr nfe 4
-NVIDIA nForce MCP Ethernet.
-.It Xr nge 4
-National Semiconductor PCI Gigabit Ethernet.
-.It Xr nofn 4
-Hifn 7814/7851/7854 HIPP1 crypto processor.
-.It Xr npx 4
-Numeric Processing Extension coprocessor and emulator.
-.It Xr opl 4
-Yamaha OPL2 and OPL3 FM synthesizer.
-.It Xr pas 4
-ProAudio spectrum audio.
-.It Xr pccom 4
-NS8250-, NS16450-, NS16550-, ST16550-, TI16750- and XR16850-based asynchronous
-serial communications.
-.It Xr pcdisplay 4
-PC display adapter driver for MDA or CGA compatible adapters.
-.It Xr pckbc 4
-Traditional PC (ISA) keyboard.
-.It Xr pctr 4
-CPU performance counter registers.
-.It Xr pms 4
-PS/2 auxiliary port mouse, for generic mice.
-.It Xr pmsi 4
-PS/2 auxiliary port mouse, for wheel mice.
-.It Xr pss 4
-Personal Sound System audio.
-.It Xr puc 4
-PCI ``universal'' communications card driver.
-.It Xr ral 4
-Ralink Technology RT2500 IEEE 802.11a/b/g wireless network interfaces.
-.It Xr ray 4
-Raytheon Raylink/WebGear Aviator IEEE 802.11FH 2Mbps wireless network adapter.
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E Ethernet adapter driver.
-.It Xr rl 4
-Realtek 8129/8139 Ethernet.
-.It Xr rt 4
-AIMS Lab Radiotrack FM radio adapter.
-.It Xr rtfps 4
-Another multiplexing serial communications card.
-.It Xr rtw 4
-Realtek RTL8180L IEEE 802.11b wireless network interfaces.
-.It Xr safe 4
-Safenet SafeXcel 1141/1741 crypto accelerator.
-.It Xr sb 4
-Sound Blaster card.
-.It Xr sea 4
-Seagate/Future Domain SCSI cards.
-.It Xr sf 4
-Adaptec AIC-6915 Starfire PCI Fast Ethernet.
-.It Xr sf2r 4
-SoundForte RadioLink SF16-FMR2 FM radio adapter.
-.It Xr sf4r 4
-SoundForte RadioLink SF64-PCR FM radio adapter.
-.It Xr sfr 4
-SoundForte RadioLink SF16-FMR FM radio adapter.
-.It Xr siop 4
-LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
-.It Xr sis 4
-SiS 900, Sis 7016 and NS DP83815 Fast Ethernet.
-.It Xr sk 4
-SysKonnect 984x Gigabit Ethernet (9841/9842/9843/9844).
-.It Xr sm 4
-SMC91C9x and SMC91C1xx-based Ethernet.
-.It Xr speaker 4
-Console speaker.
-.It Xr ste 4
-Sundance Technologies ST201 Fast Ethernet.
-.It Xr stge 4
-Sundance/Tamarack TC9021 Gigabit Ethernet.
-.It Xr sv 4
-S3 SonicVibes cards.
-.It Xr tcic 4
-Databook PCMCIA controllers.
-.It Xr ti 4
-Alteon Tigon I & II Gigabit Ethernet (3Com 3C985, Netgear GA620, etc).
-.It Xr tl 4
-Texas Instruments ThunderLAN Ethernet.
-.It Xr tr 4
-IBM TROPIC Token-Ring adapters.
-.It Xr trm 4
-TRM-S1040 based PCI SCSI Host Adapters.
-.It Xr twe 4
-3ware Escalade RAID controller.
-.It Xr txp 4
-3Com 3XP Typhoon/Sidewinder (3CR990) Ethernet.
-.It Xr uaudio 4
-USB audio devices.
-.It Xr ubsec 4
-Broadcom Bluesteelnet uBsec 5501, 5601, 5805, and 5820.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr udsbr 4
-D-Link DSB-R100 USB radio adapter.
-.It Xr uftdi 4
-FTDI FT8U100AX-based USB serial adapters.
-.It Xr uha 4
-Ultrastor ISA and EISA SCSI adapter cards.
-.It Xr ukbd 4
-USB keyboard.
-.It Xr ulpt 4
-USB printers.
-.It Xr umass 4
-USB mass storage.
-.It Xr umct 4
-MCT USB-RS232 serial adapter.
-.It Xr umidi 4
-USB MIDI devices.
-.It Xr umodem 4
-USB modems.
-.It Xr ums 4
-USB mouse.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-I/O Data USB-RSAQ2 USB serial adapters.
-.It Xr ural 4
-Ralink Technology RT2500 USB 2.0 IEEE 802.11a/b/g wireless network adapters.
-.It Xr urio 4
-Diamond Multimedia Rio MP3 device interface.
-.It Xr url 4
-Realtek RTL8150L USB Ethernet adapter.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-SCSI-over-USB scanners.
-.It Xr uvisor 4
-Handspring Visor device interface.
-.It Xr uyap 4
-YAP phone firmware interface.
-.It Xr vga 4
-PC display adapter driver for VGA compatible adapters.
-.It Xr vge 4
-VIA VT6122 Gigabit Ethernet.
-.It Xr vr 4
-VIA Rhine Ethernet.
-.It Xr wb 4
-Winbond W89C840F Fast Ethernet.
-.It Xr wdc 4
-Standard ISA Western Digital type hard drive controllers.
-MFM, RLL, ESDI, and IDE.
-.It Xr wds 4
-WD-7000 SCSI host adapters.
-.It Xr wdt 4
-Industrial Computer Source PCI-WDT50x watchdog timer cards.
-.It Xr we 4
-Western Digital/SMC WD 80x3, SMC Elite Ultra and SMC EtherEZ Ethernet cards.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.It Xr wss 4
-Windows Sound System audio.
-.It Xr wt 4
-Wangtek and compatible tape drives.
-QIC-02 and QIC-36.
-.It Xr xe 4
-Xircom PCMCIA Ethernet.
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL (3c9xx).
-.It Xr yds 4
-Yamaha DS-XG audio.
-.It Xr ym 4
-Yamaha OPL3-SAx audio.
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr cardbus 4
+introduction to CardBus support
+.It Xr eisa 4
+introduction to EISA bus support
+.It Xr isa 4
+introduction to ISA bus support
+.It Xr isapnp 4
+introduction to ISA Plug-and-Play support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.macppc/intro.4 b/share/man/man4/man4.macppc/intro.4
index 675de00f962..50e4ea7b954 100644
--- a/share/man/man4/man4.macppc/intro.4
+++ b/share/man/man4/man4.macppc/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.42 2006/07/06 14:43:50 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.43 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Valchev.
 .\" All rights reserved.
@@ -84,117 +84,25 @@ the system will have to be rebooted.
 .Pp
 The configuration system is described in
 .Xr autoconf 4 .
-A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width usscanner(4) -compact -offset indent
-.It Xr abtn 4
-ADB button.
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
 .It Xr adb 4
-Apple Desktop Bus event interface.
-.It Xr ahc 4
-Adaptec PCI SCSI host adapter driver.
-.It Xr akbd 4
-ADB keyboard.
-.It Xr ams 4
-ADB mouse.
-.It Xr an 4
-Aironet Communications 4500/4800 IEEE 802.11FH/b wireless network adapters.
-.It Xr aoa 4
-Apple aoa audio device driver.
-.It Xr asms 4
-Apple sudden motion sensor.
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr awacs 4
-Apple awacs audio device driver.
-.It Xr bge 4
-Broadcom BCM570x (Tigon3) Gigabit Ethernet boards.
-.It Xr bktr 4
-Video capture driver.
-.It Xr bm 4
-BMAC Ethernet.
-.It Xr daca 4
-Apple daca audio device driver.
-.It Xr dc 4 , Xr de 4
-DEC tulip-based Ethernet cards.
-.It Xr eap 4
-Ensoniq AudioPCI based audio.
-.It Xr em 4
-Intel PRO/1000 Ethernet driver.
-.It Xr fxp 4
-Intel EtherExpress PRO/100 Ethernet driver.
-.It Xr gem 4
-GMAC Ethernet.
-.It Xr hifn 4
-Hifn 7751 crypto accelerator.
-.It Xr hme 4
-National DP83840 Ethernet cards.
-.It Xr iop 4
-I2O adapter.
-.It Xr kauaiata 4
-ATA100 HD controller on PCI bus.
-.It Xr ki2c 4
-Kauai I2C interface stub.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
-.It Xr lofn 4
-Hifn 6500 crypto accelerator.
-.\" .It Xr macgpio 4
-.\" PMU interrupt router.
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E Ethernet adapter driver.
-.It Xr rtw 4
-Realtek RTL8180L IEEE 802.11b wireless network interfaces.
-.It Xr safe 4
-SafeNet SafeXcel 1141/1741.
-.It Xr siop 4
-LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
-.It Xr snapper 4
-Apple snapper audio device driver.
-.It Xr ti 4
-Alteon Networks Tigon I and II Gigabit Ethernet driver.
-.It Xr tpms 4
-Apple touchpad mouse.
-.It Xr tumbler 4
-Apple tumbler audio device driver.
-.It Xr uaudio 4
-USB audio devices.
-.It Xr ubsec 4
-Broadcom and BlueSteel uBsec 5x0x crypto accelerator.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr ukbd 4
-USB keyboard.
-.It Xr ulpt 4
-USB printers.
-.It Xr umass 4
-USB mass storage.
-.It Xr ums 4
-USB mouse.
-.It Xr uplcom 4
-I/O Data USB-RSAQ2 USB serial adapters.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-SCSI-over-USB scanners.
-.It Xr vgafb 4
-PCI VGA graphics.
-.It Xr vge 4
-VIA VT6122 Gigabit Ethernet.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.It Xr xl 4
-3Com EtherLink XL and Fast EtherLink XL Ethernet driver.
-.It Xr zs 4
-Zilog 8530 serial controller.
+Apple Desktop Bus driver
+.It Xr cardbus 4
+introduction to CardBus support
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.sgi/intro.4 b/share/man/man4/man4.sgi/intro.4
index e8dd740f8c6..694d7e1d438 100644
--- a/share/man/man4/man4.sgi/intro.4
+++ b/share/man/man4/man4.sgi/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.6 2005/04/30 08:58:12 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.7 2006/09/08 09:25:53 jmc Exp $
 .\"     $NetBSD: intro.4,v 1.8 2004/02/10 16:54:19 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@ system.
 Devices are indicated by their functional interface.
 Not all supported devices are listed.
 .Pp
-.Bl -tag -width 10n -offset indent -compact
+.Bl -tag -width 10n -offset 3n -compact
 .It Xr ahc 4
 Adaptec PCI SCSI host adapter driver
 .It Xr com 4
@@ -149,16 +149,19 @@ O2 on-board MAC110 Ethernet
 .\" WD33C93 SCSI interface
 .El
 .Pp
-PCI devices are supported through the
+A further list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
 .Xr pci 4
-bus and associated device drivers.
+man page.
+The following busses and controllers list these devices:
+.Pp
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr pci 4
+introduction to PCI bus support
+.El
 .Sh SEE ALSO
-.Xr ahc 4 ,
 .Xr autoconf 4 ,
-.Xr com 4 ,
-.Xr macebus 4 ,
-.Xr mavb 4 ,
-.Xr mec 4 ,
 .\" .Xr crime 4 ,
 .\" .Xr gio 4 ,
 .\" .Xr hpc 4 ,
diff --git a/share/man/man4/man4.sparc64/intro.4 b/share/man/man4/man4.sparc64/intro.4
index 65f4bbfb130..5680b8d920f 100644
--- a/share/man/man4/man4.sparc64/intro.4
+++ b/share/man/man4/man4.sparc64/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.51 2006/06/27 14:21:26 jmc Exp $
+.\"     $OpenBSD: intro.4,v 1.52 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 2001-2002 The OpenBSD Project
 .\" All Rights Reserved.
@@ -64,152 +64,23 @@ the system will have to be rebooted.
 .Pp
 The autoconfiguration system is described in
 .Xr autoconf 4 .
-A list of the supported devices is given below.
 .Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
+A complete list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCI device would be listed in the
+.Xr pci 4
+man page.
+The following busses and controllers list these devices:
 .Pp
-.Bl -tag -width zs/zstty/zskbd(4) -compact -offset indent
-.It Xr agten 4
-Fujitsu AG-10e frame buffer.
-.It Xr ahc 4
-Adaptec 2xxx and 3xxx series PCI/VLB/EISA SCSI adapter boards.
-.It Xr apio 4
-Aurora SBus pio1 parallel ports.
-.It Xr asio 4
-Aurora SBus sio2 serial ports.
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr audioce 4
-EBus CS4231 based audio.
-.It Xr audiocs 4
-SBus CS4231 based audio.
-.It Xr autri 4
-PCI Trident 4DWAVE DX/NX, SiS 7018, ALi M5451 audio.
-.It Xr be 4
-10BaseT/100BaseTX SBus Ethernet controller.
-.It Xr beeper 4
-Simple speaker beeper.
-.It Xr bwtwo 4
-SBus monochrome frame buffer.
-.It Xr central 4
-Central bus controller.
-.It Xr cgsix 4
-accelerated 8 bit SBus color frame buffer.
-.It Xr cgthree 4
-8 bit SBus color frame buffer.
-.It Xr cgtwelve 4
-accelerated 24 bit SBus color frame buffer.
-.It Xr clkbrd 4
-Main system clock for E4500.
-.It Xr clock 4
-Realtime clock.
-.It Xr com 4
-EBUS clones of the NS16550 serial UART.
-.It Xr comkbd 4
-Sun serial keyboards on
-.Xr com 4
-ports.
-.It Xr creator 4
-UPA Creator/Creator 3D/Elite 3D color frame buffer.
-.It Xr dc 4
-Clones of the DEC Tulip Ethernet controller.
-.It Xr eap 4
-Ensoniq AudioPCI based audio.
-.It Xr epic 4
-SMC 83C170 (EPIC/100) Ethernet driver.
-.It Xr eso 4
-ESS Technology Solo-1 PCI AudioDrive based audio.
-.It Xr esp 4
-ESP SCSI controller.
-.It Xr fhc 4
-FireHose controller.
-.It Xr fxp 4
-Intel EtherExpress PRO/100 Ethernet driver.
-.It Xr gem 4
-GEM Gigabit Ethernet interface.
-.It Xr hifn 4
-Hifn 7751/7811/7951 cryptography accelerators.
-.It Xr hme 4
-Sun HME Ethernet controllers (SunSwift).
-.It Xr isp 4
-Qlogic ISP SCSI controller.
-.It Xr le/lebuffer 4
-AMD 7990 LANCE Ethernet controller.
-.It Xr lofn 4
-Hifn 6500 public key cryptography engine.
-.It Xr lpt 4
-Parallel port driver.
-.It Xr magma 4
-MAGMA serial/parallel communication boards.
-.It Xr mgx 4
-.Tn Southland Media Systems
-MGX and MGXPlus frame buffers.
-.It Xr openprom 4
-Sun Open boot PROM (what became IEEE 1275) configuration driver.
-.It Xr pckbd 4
-PS/2-style keyboard driver.
-.It Xr pcons 4
-PROM console input/output device.
-.It Xr pms/pmsi 4
-PS/2 auxiliary port mouse driver.
-.It Xr qe 4
-Quad 10BaseT SBus Ethernet controller.
-.It Xr qec 4
-Supported as carrier for
-.Nm be
-or
-.Nm qe
-Ethernet controllers.
-.It Xr re 4
-RealTek 8139C+/8169/816xS/811xS/8101E Ethernet adapter driver.
-.It Xr rfx 4
-Vitec/Connectware/AP&D
-.Tn RasterFlex
-framebuffer series.
-.It Xr sab 4
-Infineon (formerly Siemens) SAB82532 serial controller.
-.It Xr siop 4
-LSI/Symbios Logic/NCR 53c8xxx SCSI driver.
-.It Xr spif 4
-Sun SUNW,spif serial/parallel communication boards.
-.It Xr stp 4
-SBus
-.Xr pcmcia 4
-bridge.
-.It Xr ti 4
-Alteon Networks Tigon I and II Gigabit Ethernet driver.
-.It Xr timer 4
-Onboard system timer.
-.It Xr tvtwo 4
-Parallax XVideo and PowerVideo 24 bit SBus color frame buffer.
-.It Xr ubsec 4
-Bluesteelnet 5501/5601, Broadcom 5805/5820/5821 cryptography accelerators.
-.It Xr ukbd 4
-USB keyboard.
-.It Xr ums 4
-USB mouse.
-.It Xr uperf 4
-Performance counters on SBUS/PCI machines.
-.It Xr ural 4
-Ralink Technology RT2500 USB 2.0 IEEE 802.11a/b/g wireless network adapters.
-.It Xr vgafb 4
-PCI graphics frame buffer.
-.It Xr vigra 4
-8 bit SBus color framebuffer with VGA-compatible modes and connector.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
-.It Xr xbox 4
-SBus Expansion subsystem.
-.It Xr xl 4
-xl 3Com EtherLink XL and Fast EtherLink XL Ethernet driver.
-.It Xr zs/zstty/zskbd 4
-Zilog 8530 serial controller (and serial keyboards).
-.It Xr zx 4
-24 bit accelerated SBus color frame buffer.
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr pci 4
+introduction to PCI bus support
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr sbus 4
+introduction to sbus bus support
+.It Xr usb 4
+introduction to Universal Serial Bus support
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.zaurus/intro.4 b/share/man/man4/man4.zaurus/intro.4
index 40df268a36e..a5b68ce0d79 100644
--- a/share/man/man4/man4.zaurus/intro.4
+++ b/share/man/man4/man4.zaurus/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.8 2005/11/17 05:31:09 uwe Exp $
+.\"	$OpenBSD: intro.4,v 1.9 2006/09/08 09:25:53 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -98,29 +98,13 @@ Not all supported devices are listed.
 .Bl -tag -width lotsofletters -compact -offset indent
 .It Xr apm 4
 On-board power management.
-.It Xr atu 4
-Atmel AT76C50x IEEE 802.11b wireless network interfaces.
-.It Xr aue 4
-ADMtek AN986-based USB Ethernet adapters.
-.It Xr axe 4
-ASIX Electronics AX88172/AX88178 USB Ethernet adapters.
 .It Xr cd 4
 ATAPI or SCSI CD drives.
-.It Xr cdce 4
-USB Communication Device Class Ethernet adapters.
 .It Xr com 4
 NS16550-compatible asynchronous serial ports.
 .\" cpu
-.It Xr cue 4
-CATC USB-EL1201A based USB Ethernet adapters.
-.It Xr kue 4
-Kawasaki LSI KL5KUSB101B-based USB Ethernet.
 .It Xr lcd 4
 On-board LCD display.
-.It Xr ne 4
-NE2000 and compatible Ethernet devices.
-.It Xr ohci 4
-USB host controller.
 .It Xr pxadmac 4
 On-board DMA controller.
 .It Xr pxagpio 4
@@ -139,58 +123,10 @@ On-board timer.
 On-board CF/PCMCIA and GPIO controller.
 .It Xr sd 4
 SCSI disks.
-.It Xr uaudio 4
-USB audio devices.
-.It Xr ubsa 4
-USB Belkin serial adapter.
-.It Xr udav 4
-Davicom DM9601 USB Ethernet adapters.
-.It Xr udsbr 4
-D-Link DSB-R100 radio.
-.It Xr uftdi 4
-USB FTDI FT8U100AX serial adapters.
-.It Xr uhid 4
-USB human interface devices.
-.It Xr uhub 4
-USB hubs.
-.It Xr ukbd 4
-USB keyboards.
-.It Xr ulpt 4
-USB printers..
-.It Xr umass 4
-USB mass storage.
-.It Xr umct 4
-USB MCT RS232 serial adapters.
-.It Xr umidi 4
-USB MIDI devices.
-.It Xr umodem 4
-USB modems.
-.It Xr ums 4
-USB mouses.
-.It Xr upl 4
-Prolific PL2301/PL2302-based host-to-host USB connectors.
-.It Xr uplcom 4
-USB Prolific PL2303 serial adapters.
-.It Xr ural 4
-Ralink Technology RT2500 USB 2.0 IEEE 802.11a/b/g wireless network adapters.
-.It Xr urio 4
-Diamond Multimedia Rio 500.
-.It Xr url 4
-Realtek RTL8150L USB Ethernet adapters.
-.It Xr uscanner 4
-USB scanners.
-.It Xr usscanner 4
-USB SCSI scanners.
-.It Xr uvisor 4
-Handspring Visor.
-.It Xr uvscom 4
-USB SUNTAC Slipper U VS-10U serial adapter.
 .It Xr wd 4
 IDE disks.
 .It Xr wdc 4
 IDE disk controller.
-.It Xr wi 4
-WaveLAN/IEEE, PRISM 2-3 and Spectrum24 IEEE 802.11b wireless network adapters.
 .It Xr zaudio 4
 On-board audio.
 .It Xr zkbd 4
@@ -202,6 +138,20 @@ SSP for inter-chip communication.
 .It Xr zts 4
 System touch-screen.
 .El
+.Pp
+A further list of available devices is contained within the pages
+describing the system busses and controllers.
+For example, a PCMCIA device would be listed in the
+.Xr pcmcia 4
+man page.
+The following busses and controllers list these devices:
+.Pp
+.Bl -tag -width "cardbus(4)XX" -offset 3n -compact
+.It Xr pcmcia 4
+introduction to PCMCIA (PC Card) support
+.It Xr usb 4
+introduction to Universal Serial Bus support
+.El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
 .Xr config 8