Update man pages in the section 4 to match the reality in -CURRENT.

- Change lines referring to kernel configuration file:
        device foo0 at isa port xxx irq yyy...
  to
        device foo
  Describe resource "hints" in /boot/device.hints.

- Try to describe resource allocation and probe/attach behavior in the
  newbus framework.

53 files changed, 522 insertions, 205 deletions

diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 50c0c9b..dbb82c6 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -32,7 +32,11 @@
 .Sh SYNOPSIS
 For one or more ISA or VL cards:
 .Cd device isa
-.Cd device "adv0 at isa? port ? irq ? drq ?"
+.Cd device adv
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.adv.0.at="isa"
 .Pp
 For one or more EISA cards:
 .Cd device eisa
@@ -43,7 +47,7 @@ For one or more PCI cards:
 .Cd device adv
 .Pp
 For one or more SCSI busses:
-.Cd device scbus0 at adv0
+.Cd device scbus
 .Sh DESCRIPTION
 This driver provides access to the 8bit
 .Tn SCSI
@@ -130,15 +134,15 @@ ABP[3]980UA   PCI     No         20MHz       16       4
 .El
 .Ed
 .Pp
-For ISA or Vesa Local Bus adapters, one kernel config entry is required
-for every card to be attached by the system.  Specific values for the port
-address, irq, and drq may be specified.  If wildcard values are used, the
-driver will query the device for its current settings and use those.  If
-the port address is a wildcard, the driver consults an internal table of
-possible port address locations and attaches to the first unattached card
-it finds.  The possible port addresses for these card are 0x110, 0x130,
-0x150, 0x190, 0x210, 0x230, 0x250, and 0x330.
-.Pp
+.\" For ISA or Vesa Local Bus adapters, one kernel config entry is required
+.\" for every card to be attached by the system.  Specific values for the port
+.\" address, irq, and drq may be specified.  If wildcard values are used, the
+.\" driver will query the device for its current settings and use those.  If
+.\" the port address is a wildcard, the driver consults an internal table of
+.\" possible port address locations and attaches to the first unattached card
+.\" it finds.  The possible port addresses for these card are 0x110, 0x130,
+.\" 0x150, 0x190, 0x210, 0x230, 0x250, and 0x330.
+.\" .Pp
 Per target configuration performed in the
 .Tn AdvanceWare
 menu, which is accessible at boot,
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index a42fbf9..3d20f56 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -30,11 +30,11 @@
 .Nm adw
 .Nd Advansys PCI 16bit SCSI Host adapter driver
 .Sh SYNOPSIS
-.Cd controller pci
-.Cd controller adw
+.Cd device pci
+.Cd device adw
 .Pp
 For one or more SCSI busses:
-.Cd controller scbus0 at adw0
+.Cd device scbus
 .Sh DESCRIPTION
 This driver provides access to the 16bit
 .Tn SCSI
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index ba0b397..91e9a0b 100644
--- a/share/man/man4/aha.4
+++ b/share/man/man4/aha.4
@@ -33,8 +33,12 @@
 .Nm aha
 .Nd Adaptec SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd device "aha0 at isa? port ? irq ? drq 5"
-.Cd device scbus0 at aha0
+.Cd device aha
+.Cd device scbus
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.aha.0.at="isa"
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index b767534..f0fca3c 100644
--- a/share/man/man4/ahb.4
+++ b/share/man/man4/ahb.4
@@ -34,7 +34,7 @@
 .Nd Adaptec EISA SCSI host adapter driver
 .Sh SYNOPSIS
 .Cd device ahb
-.Cd device scbus0 at ahb0
+.Cd device scbus
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 831ee30..eac2b8f 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -48,7 +48,7 @@ To configure one or more controllers to assume the target role:
 .Cd options AHC_TMODE_ENABLE <bitmask of units>
 .Pp
 For one or more SCSI busses:
-.Cd device scbus0 at ahc0
+.Cd device scbus
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 56df198..94590ca 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -38,7 +38,6 @@
 .Nd "Aironet Communications 4500/4800 wireless network adapter driver"
 .Sh SYNOPSIS
 .Cd "device an"
-.Cd "device an0 at isa? port 0x140 irq 5"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index 099d043..8e7f8f1 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -39,8 +39,16 @@
 .Sh SYNOPSIS
 For ISA based ATA/ATAPI support:
 .Cd device isa
-.Cd device ata0 at isa? port IO_WD1 irq 14
-.Cd device ata1 at isa? port IO_WD2 irq 15
+.Cd device ata
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.ata.0.at="isa"
+.Cd hint.ata.0.port="0x1f0"
+.Cd hint.ata.0.irq="14"
+.Cd hint.ata.1.at="isa"
+.Cd hint.ata.1.port="0x170"
+.Cd hint.ata.1.irq="15"
 .Pp
 For PCI based ATA/ATAPI support:
 .Cd device pci
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index adce166..19410f4 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -36,7 +36,12 @@
 .Cd "options ATKBD_DFLT_KEYMAP"
 .Cd "makeoptions ATKBD_DFLT_KEYMAP=_keymap_name_"
 .Cd "options KBD_DISABLE_KEYMAP_LOAD"
-.Cd "device atkbd0 at atkbdc? irq 1"
+.Cd "device atkbd"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.atkbd.0.at="atkbdc"
+.Cd hint.atkbd.0.irq="1"
 .Sh DESCRIPTION
 The
 .Nm
@@ -138,13 +143,12 @@ changing key assignment.
 .Ss Driver Flags
 The
 .Nm
-driver accepts the following driver flags.  They can be set either in the
-kernel configuration file
-(see
-.Xr config 8 ) ,
-or else in the User Configuration Menu at boot time
+driver accepts the following driver flags.
+They can be set either in
+.Pa /boot/device.hints ,
+or else from within the boot loader
 (see
-.Xr boot 8 ) .
+.Xr loader 8 ) .
 .Bl -tag -width FAIL
 .It bit 0 (FAIL_IF_NO_KBD)
 By default the
@@ -171,16 +175,25 @@ driver requires the keyboard controller
 .Nm atkbdc .
 Thus, the kernel configuration file should contain the following lines.
 .Pp
-.Dl "device atkbdc0 at isa"
-.Dl "device atkbd0 at atkbdc? irq 1"
+.Dl "device atkbdc"
+.Dl "device atkbd"
 .Pp
 The following example shows how to set the default, built-in keymap
 to
 .Pa jp.106.kbd .
 .Pp
+.Dl "device atkbdc"
 .Dl "options ATKBD_DFLT_KEYMAP"
 .Dl "makeoptions ATKBD_DFLT_KEYMAP=jp.106"
-.Dl "device atkbd0 at atkbdc? irq 1"
+.Dl "device atkbd"
+.Pp
+In both cases, you also need to have following lines in
+.Pa /boot/device.hints .
+.Pp
+.Dl hint.atkbdc.0.at="isa"
+.Dl hint.atkbdc.0.port="0x060"
+.Dl hint.atkbd.0.at="atkbdc"
+.Dl hint.atkbd.0.irq="1"
 .Pp
 .\".Sh DIAGNOSTICS
 .\".Sh CAVEATS
@@ -191,8 +204,7 @@ to
 .Xr pcvt 4 ,
 .Xr psm 4 ,
 .Xr syscons 4 ,
-.Xr boot 8 ,
-.Xr config 8
+.Xr loader 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 3211496..46d30c1 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -36,7 +36,12 @@
 .Cd "options KBD_RESETDELAY=N"
 .Cd "options KBD_MAXWAIT=N"
 .Cd "options KBDIO_DEBUG=N"
-.Cd "device atkbdc0 at isa? port IO_KBD"
+.Cd "device atkbdc"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.atkbdc.0.at="isa"
+.Cd hint.atkbdc.0.port="0x060"
 .Sh DESCRIPTION
 The keyboard controller
 .Nm
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 75ebeb5..252a2df 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -8,7 +8,7 @@
 .Nm awi
 .Nd "AMD PCnetMobile IEEE 802.11 PCMCIA wireless network driver"
 .Sh SYNOPSIS
-.Cd "awi*     at pcmcia? function ?"
+.Cd "device awi"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index cda57c0..d67cd66 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -33,8 +33,13 @@
 .Nm bt
 .Nd Buslogic/Mylex MultiMaster SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd "device bt0 at isa? port ? irq ?"
-.Cd device scbus0 at bt0
+.Cd device bt
+.Cd device scbus
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.bt.0.at="isa"
+.Cd hint.bt.0.port="0x330"
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 539cf26..0eec2f1 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -33,7 +33,6 @@
 .Nd SCSI CD-ROM driver
 .Sh SYNOPSIS
 .Cd device cd
-.Cd device cd1 at scbus0 target 4 unit 0
 .Cd "options ""CHANGER_MIN_BUSY_SECONDS=3"""
 .Cd "options ""CHANGER_MAX_BUSY_SECONDS=11""
 .Sh DESCRIPTION
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 1d190e1..265f0ad 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -45,8 +45,27 @@
 .Nd Cyclades Cyclom-Y serial driver
 .Sh SYNOPSIS
 .Cd "options CY_PCI_FASTINTR"
-.Cd "device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000"
-.Cd "device cy1 at isa? irq 11 iomem 0xd6000 iosiz 0x2000"
+.Cd "device cy 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Pp
+If you have two cards:
+.Cd "options CY_PCI_FASTINTR"
+.Cd "device cy 2"
+.Pp
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Cd hint.cy.1.at="isa"
+.Cd hint.cy.1.irq="11"
+.Cd hint.cy.1.maddr="0xd6000"
+.Cd hint.cy.1.msize="0x2000"
 .Pp
 Minor numbering:
 .Pp
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 6efbb89..89aaba0 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -33,7 +33,6 @@
 .Nd SCSI Direct Access device driver
 .Sh SYNOPSIS
 .Cd device da
-.Cd device da1 at scbus0 target 4 unit 0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 4ae9865..288ff05 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -33,9 +33,19 @@
 .Nm fdc
 .Nd PC architecture floppy disk controller driver
 .Sh SYNOPSIS
-.Cd "device fdc0 at isa? port IO_FD1 flags 0x1 irq 6 drq 2"
-.Cd device fd0 at fdc0 drive 0
-.Cd device fd1 at fdc0 drive 1
+.Cd device fdc
+.Cd device fd
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.fdc.0.at="isa"
+.Cd hint.fdc.0.port="0x3F0"
+.Cd hint.fdc.0.irq="6"
+.Cd hint.fdc.0.drq="2"
+.Cd hint.fd.0.at="fdc0"
+.Cd hint.fd.0.drive="0"
+.Cd hint.fd.1.at="fdc0"
+.Cd hint.fd.1.drive="1"
 .Sh DESCRIPTION
 This driver provides access to floppy disk drives.
 In /dev for each floppy device a number of minor devices are present.
diff --git a/share/man/man4/gusc.4 b/share/man/man4/gusc.4
index 5a788a2..705c53d 100644
--- a/share/man/man4/gusc.4
+++ b/share/man/man4/gusc.4
@@ -32,11 +32,16 @@
 .Nm gusc
 .Nd Gravis UltraSound ISA bridge device driver
 .Sh SYNOPSIS
-For PnP cards:
+.Cd "device pcm"
 .Cd "device gusc"
 .Pp
-For non-PnP cards:
-.Cd "device gusc0 at isa? port 0x220 irq 5 drq 1 flags 0x13"
+For non-PnP cards, add the following lines in
+.Pa /boot/device.hints .
+.Cd hint.gusc.0.at="isa"
+.Cd hint.gusc.0.port="0x220"
+.Cd hint.gusc.0.irq="5"
+.Cd hint.gusc.0.drq="1"
+.Cd hint.gusc.0.flags="0x13"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index 938ee34..9f90628 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -14,6 +14,11 @@ To link into the kernel:
 To load as a kernel loadable module:
 .Dl kldload joy
 .Pp
+In
+.Pa /boot/device/hints :
+.Cd hint.joy.0.at="isa"
+.Cd hint.joy.0.port="0x201"
+.Pp
 .In machine/joystick.h
 .Sh DESCRIPTION
 The joystick device driver allows applications to read the status of
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index 841ffc8..477b1e3 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -48,7 +48,7 @@
 .Pp
 .Cd "device ppbus"
 .Cd "device plip"
-.Cd "device ppc0 at isa? port? irq 7"
+.Cd "device ppc"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index ff9aac7..7990d80 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -34,22 +34,9 @@
 .Nm lpt
 .Nd generic printer device driver
 .Sh SYNOPSIS
+.Cd "device ppc"
 .Cd "device ppbus"
 .Cd "device lpt"
-.Pp
-.Cd "device	ppc0	at isa? port IO_LPT1 irq 7"
-.Cd "device	ppc1	at isa? port IO_LPT2 irq 7"
-.Cd "device	ppc2	at isa? port IO_LPT3 irq 7"
-.Pp
-For BIOS-probed ports:
-.Cd "device ppc0 at isa? port? irq 7"
-.Pp
-For polled ports:
-.Cd "device ppc0 at isa? port?"
-.Cd "device ppc1 at isa? port IO_LPT2"
-.Pp
-For DMA capable parallel port:
-.Cd "device ppc0 at isa? port? irq 7 drq 1"
 .Sh DESCRIPTION
 The current
 .Em lpt
@@ -89,6 +76,7 @@ If the printer supports IEEE1284 nibble mode and has
 data to send to the host, you'll get it.
 .Sh SEE ALSO
 .Xr ppbus 4 ,
+.Xr ppc 4 ,
 .Xr lptcontrol 8
 .Sh HISTORY
 This driver replaces the functionality of the lpa
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index c48d005..f36edd1 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -30,7 +30,11 @@
 .Nm aic
 .Nd Adaptec AIC-6260 and AIC-6360 SCSI driver
 .Sh SYNOPSIS
-.Cd "device aic0 at isa? port 0x340 irq 11"
+.Cd "device aic"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.aic.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/asc.4 b/share/man/man4/man4.i386/asc.4
index 2c8c66d..3ff0e21 100644
--- a/share/man/man4/man4.i386/asc.4
+++ b/share/man/man4/man4.i386/asc.4
@@ -37,7 +37,14 @@
 .Nm asc
 .Nd device driver for a GI1904-based hand scanner
 .Sh SYNOPSIS
-.Cd "device asc0 at isa? port IO_ASC1 drq 3 irq 10"
+.Cd "device asc 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.asc.0.at="isa"
+.Cd hint.asc.0.port="0x3EB"
+.Cd hint.asc.0.drq="3"
+.Cd hint.asc.0.irq="10"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index 95657c2..60c219e 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -32,8 +32,14 @@
 .Nm cs
 .Nd ethernet device driver
 .Sh SYNOPSIS
-.Cd "device cs0 at isa? port 0x300 irq ?"
-.Cd "device cs1 at isa? port 0x300 irq 10 iomem 0xd0000"
+.Cd "device cs"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.cs.0.at="isa"
+.Cd hint.cs.0.port="0x300"
+.Cd hint.cs.0.irq="10"
+.Cd hint.cs.0.maddr="0xd000"
 .Sh DESCRIPTION
 The
 .Nm
@@ -48,9 +54,14 @@ size and low cost of the CS89x0 family compensate for their drawbacks.
 .Pp
 The
 .Nm
-driver will obtain configuration parameters either from the configuration entry
-or from the card.  Parameters specified in the configuration entry will be
-used if present; the card may be soft-configured so these may be any valid
+driver will obtain configuration parameters either from
+.Pa /boot/device.hints
+or from the card.
+At least the I/O port number must be specified.
+Other parameters specified in
+.Pa /boot/device.hints
+will be used if present;
+the card may be soft-configured so these may be any valid
 value.  Adapters based on the CS8920 normally offer PnP configuration and the driver
 will detect the
 .Tn IBM EtherJet
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index ea4def5..55f185e 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -8,11 +8,19 @@
 .Nm cx
 .Nd asynchronous/synchronous Cronyx-Sigma adapter driver
 .Sh SYNOPSIS
-.Cd "device cx0 at isa? port 0x240 irq 15 drq 7"
-.Cd "device cx1 at isa? port 0x260 irq 12 drq 6"
+.Cd "device cx 1"
 .Cd device sppp
 .Pp
-The base i/o port address should be set by jumpers on the board.
+In
+.Pa /boot/device.hints :
+.Cd hint.cx.0.at="isa"
+.Cd hint.cx.0.port="0x240"
+.Cd hint.cx.0.irq="15"
+.Cd hint.cx.0.drq="7"
+.Pp
+The base i/o port address specified in
+.Pa /boot/device.hints
+must match the port address set by jumpers on the board.
 The DMA i/o channel and interrupt request numbers are configured
 by software at adapter initialization.  Legal values are:
 .Pp
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index 1d190e1..265f0ad 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -45,8 +45,27 @@
 .Nd Cyclades Cyclom-Y serial driver
 .Sh SYNOPSIS
 .Cd "options CY_PCI_FASTINTR"
-.Cd "device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000"
-.Cd "device cy1 at isa? irq 11 iomem 0xd6000 iosiz 0x2000"
+.Cd "device cy 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Pp
+If you have two cards:
+.Cd "options CY_PCI_FASTINTR"
+.Cd "device cy 2"
+.Pp
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Cd hint.cy.1.at="isa"
+.Cd hint.cy.1.irq="11"
+.Cd hint.cy.1.maddr="0xd6000"
+.Cd hint.cy.1.msize="0x2000"
 .Pp
 Minor numbering:
 .Pp
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index caf3f1d..db416ac 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.4
@@ -30,7 +30,13 @@
 .Nm el
 .Nd Ethernet driver for 3Com Etherlink 3C501 device driver
 .Sh SYNOPSIS
-.Cd "device el0 at isa? port 0x300 irq 9"
+.Cd "device el 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.el.0.at="isa"
+.Cd hint.el.0.port="0x300"
+.Cd hint.el.0.irq="9"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index f999309..1741b71 100644
--- a/share/man/man4/man4.i386/ex.4
+++ b/share/man/man4/man4.i386/ex.4
@@ -32,15 +32,15 @@
 .Nm ex
 .Nd "Ethernet device driver for the Intel EtherExpress Pro/10 and Pro/10+"
 .Sh SYNOPSIS
-.Cd "device ex0 at isa? port? irq ?"
+.Cd "device ex"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for the 16-bit PCI Intel EtherExpress Pro/10
 and Pro/10+ Ethernet cards based on the Intel i82595 chip.
 .Pp
-If the port start address isn't found, the card will be searched for in the
-I/O address range 0x200 - 0x3a0.  If the IRQ isn't specified, it will be
+The card will be searched for in the
+I/O address range 0x200 - 0x3a0.  If the IRQ will be
 read from the EEPROM on the card.  For correct operation on newer
 cards the Plug-N-Play support should be disabled.
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 57a958b..07b6d42 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -29,7 +29,13 @@
 .Nm fe
 .Nd Fujitsu MB86960A/MB86965A based Ethernet adapters
 .Sh SYNOPSIS
-.Cd "device fe0 at isa? port 0x300 irq ?"
+.Cd "device fe 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.fe.0.at="isa"
+.Cd hint.fe.0.port="0x300"
+.Cd hint.fe.0.flags="0x0"
 .Sh DESCRIPTION
 The
 .Nm
@@ -49,7 +55,9 @@ It currently works with Fujitsu FMV-180 series for ISA,
 Allied-Telesis AT1700 series and RE2000 series for ISA,
 and Fujitsu MBH10302 PC card.
 .Ss Parameters
-On the kernel configuration file, two parameters,
+In the
+.Pa /boot/device.hints
+file, two parameters,
 .Ar port
 and
 .Ar irq ,
@@ -57,8 +65,6 @@ must be specified to reflect adapter hardware settings.
 Another parameter
 .Ar flags
 can be specified to provide additional configuration as an option.
-Other parameters of the device statement
-must appear as described on the synopsis.
 .Pp
 The
 .Ar port
@@ -66,8 +72,9 @@ parameter specifies a base I/O port address of the adapter.
 It must match with the hardware setting of the adapter.
 The
 .Ar port
-may be a left unspecified as
-.Dq Li \&? .
+may be left unspecified by removing
+.Dl hint.fe.0.port="..."
+from the file.
 In that case, the driver tries to detect the hardware setting
 of the I/O address automatically.
 This feature may not work with some adapter hardware.
@@ -77,8 +84,9 @@ The
 parameter specifies an IRQ number used by the adapter.
 It must match the hardware setting of the adapter.
 .Ar Irq
-may be left unspecified as
-.Dq Li \&? ;
+may be left unspecified by removing
+.Dl hint.fe.0.irq="..."
+from the file.
 in that case, the driver tries to detect
 the hardware setting of the IRQ automatically.
 This feature may not work on some adapters.
@@ -187,23 +195,24 @@ Automatic I/O port address detection feature of
 works mostly fine for FMV-180 series.
 It works even if there are two or more FMV-180s in a system.
 However, some combination of other adapters may confuse the driver.
-It is recommended not to use
-.Em "port ?"
+It is recommended to explicitly specify
+.Ar port
 when you experience some difficulties with hardware probe.
 .Pp
 Automatic IRQ detection feature of
 .Nm
 works reliably for FMV-180 series.
-It is recommended to use
-.Em "irq ?"
+It is recommended to explicitly specify
+.Ar irq
 always for FMV-180.
 The hardware setting of IRQ is read
 from the configuration EEPROM on the adapter,
 even when the kernel config file specifies an IRQ value.
 The driver will generate a warning message,
-if the IRQ setting specified in the kernel config file
+if the IRQ setting specified in
+.Pa /boot/device.hints
 does not match one stored in EEPROM.
-Then, it will use the value specified in the config file.
+Then, it will use the value specified in the file.
 (This behavior has been changed from the previous releases.)
 .Ss Allied-Telesis AT1700 series and RE2000 series adapters
 Automatic I/O port address detection
@@ -218,8 +227,9 @@ The
 driver
 tries to get IRQ setting from the configuration EEPROM on the board,
 if
-.Dq irq ?\&
-is specified in the configuration file.
+.Ar irq
+is not specified in
+.Pa /boot/device.hints .
 Unfortunately,
 AT1700 series and RE2000 series seems to have two types of models;
 One type allows IRQ selection from 3/4/5/9,
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index b19625e..72ec17e 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -11,7 +11,18 @@
 .Nm ie
 .Nd ethernet device driver
 .Sh SYNOPSIS
-.Cd "device ie0 at isa? port 0x360 irq 7 iomem 0xd0000"
+.Cd "device ie 2"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.ie.0.at="isa"
+.Cd hint.ie.0.port="0x300"
+.Cd hint.ie.0.irq="5"
+.Cd hint.ie.0.maddr="0xd0000"
+.Cd hint.ie.1.at="isa"
+.Cd hint.ie.1.port="0x360"
+.Cd hint.ie.1.irq="7"
+.Cd hint.ie.1.maddr="0xd0000"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/le.4 b/share/man/man4/man4.i386/le.4
index c5f1588..07f3711 100644
--- a/share/man/man4/man4.i386/le.4
+++ b/share/man/man4/man4.i386/le.4
@@ -32,7 +32,14 @@
 .Nm le
 .Nd DEC EtherWORKS II/III Ethernet device driver
 .Sh SYNOPSIS
-.Cd "device le0 at isa? port 0x300 irq 5 iomem 0xd0000"
+.Cd "device le 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.le.0.at="isa"
+.Cd hint.le.0.port="0x300"
+.Cd hint.le.0.irq="5"
+.Cd hint.le.0.maddr="0xd0000"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/lnc.4 b/share/man/man4/man4.i386/lnc.4
index bcc5326..f45c36f 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.4
@@ -32,7 +32,14 @@
 .Nm lnc
 .Nd AMD Lance/PCnet Ethernet device driver
 .Sh SYNOPSIS
-.Cd "device lnc0 at isa? port 0x280 irq 10 drq 0"
+.Cd "device lnc 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.lnc.0.at="isa"
+.Cd hint.lnc.0.port="0x280"
+.Cd hint.lnc.0.irq="10"
+.Cd hint.lnc.0.drq="0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index 44d3b78..e66b128 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -91,9 +91,11 @@
 .Nm matcd
 .Nd Matsushita (Panasonic) CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device matcd[0-4] at isa? port [?| addr]"
-.Cd "/dev/[r]matcd[0-15][a|c]
-.Cd "/dev/[r]matcd[0-15]l[a|c]
+.Cd "device matcd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.matcd.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
@@ -122,17 +124,16 @@ to support and delete the device entries that you don't want.
 .Pp
 In this file, you will find an entry like:
 .Bd -literal -offset indent
-device  matcd0  at  isa?  port  ?
+device  matcd 1
 .Ed
 .Pp
 To support two host interfaces, change the file so it reads:
 .Bd -literal -offset indent
-device  matcd0  at  isa?  port  ?
-device  matcd1  at  isa?  port  ?
+device  matcd 2
 .Ed
 .Pp
-(If you want to support up to three or four host interfaces, add
-additional entries).
+(If you want to support up to three or four host interfaces,
+increase the number at the end of the line).
 .Pp
 Note that the kernel configuration does not need to be modified to support
 up to four drives on a single host interface.  It is also not necessary to
@@ -153,29 +154,26 @@ where the CD-ROM host interfaces are located.  For example, by default most
 SoundBlaster cards have the Matsushita CD-ROM host interface
 located at I/O port 0x230.  (This is 0x10 above the I/O port for the
 audio section of the card.)  If this is the case for your system, you could
-change where the kernel looks for the hardware by using the -c option at
-the kernel boot prompt.  This will load the kernel and then give you the
-opportunity to change settings for any of the devices included the kernel.
+change where the kernel looks for the hardware by entering a line in
+.Pa /boot/device.hints .
 For example, to change the I/O port for
 .Nm
-adapter zero to 0x340, you would type
-.Pp
-.Dl "config> port matcd0c 0x340"
+adapter zero to 0x340, you would put
 .Pp
-If you recompile the kernel, you can change the entry in the kernel
-configuration file to specify a specific address by changing an entry
-like this:
+.Dl hint.matcd.0.port="0x340"
 .Pp
-.Dl "device  matcd0  at  isa?  port  0x230"
+in the file.
 .Pp
 With this change, the
 .Nm
-driver will only look at I/O port 0x230 for the first CD-ROM host interface
+driver will only look at I/O port 0x340 for the first CD-ROM host interface
 and will not disturb any other I/O ports.
 .Pp
-Once you have adjusted the kernel configuration file, it is necessary
-to configure and recompile the kernel, install it and reboot for the
-changes to take effect.
+You can specify the I/O port for the second, third, and fourth
+adapters in the same fashion:
+.Pp
+.Dl hint.matcd.0.port="0x230"
+.Dl hint.matcd.1.port="0x340"
 .Sh SUPPORTED HARDWARE
 At this time, there are only two known drive models that work with the
 .Nm
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 11136fa..8d254f8 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -33,7 +33,13 @@
 .Nm mcd
 .Nd Mitsumi CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device mcd0 at isa? port 0x300 irq 10"
+.Cd "device mcd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.mcd.0.at="isa"
+.Cd hint.mcd.0.port="0x300"
+.Cd hint.mcd.0.irq="10"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 64b2748..d79b6bf 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -20,7 +20,13 @@
 .Nd bus and InPort mice driver
 .Sh SYNOPSIS
 .\" .Cd "options MSE_XXX=N"
-.Cd "device mse0 at isa? port 0x23c irq 5"
+.Cd "device mse"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.mse.0.at="isa"
+.Cd hint.mse.0.port="0x23c"
+.Cd hint.mse.0.irq="5"
 .Sh DESCRIPTION
 The
 .Nm
@@ -342,13 +348,24 @@ movement counts as described in
 .Em devfs .
 .El
 .Sh EXAMPLES
-.Dl "device mse0 at isa? port 0x23c irq 5"
+.Dl "device mse"
+.Pp
+In
+.Pa /boot/device.hints :
+.Dl hint.mse.0.at="isa"
+.Dl hint.mse.0.port="0x23c"
+.Dl hint.mse.0.irq="5"
 .Pp
 Add the
 .Nm
 driver at the primary port address with the IRQ 5.
 .Pp
-.Dl "device mse1 at isa? port 0x238 flags 0x30 irq 4"
+.Dl "device mse"
+.Pp
+.Dl hint.mse.1.at="isa"
+.Dl hint.mse.1.port="0x238"
+.Dl hint.mse.1.irq="4"
+.Dl hint.mse.1.flags="0x30"
 .Pp
 Define the
 .Nm
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index ed61869..f5e9088 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/man4.i386/pcf.4
@@ -31,7 +31,13 @@
 .Nm pcf
 .Nd Philips I2C bus controller
 .Sh SYNOPSIS
-.Cd "device pcf0 at isa? port? irq 5"
+.Cd "device pcf"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.pcf.0.at="isa"
+.Cd hint.pcf.0.port="0x320"
+.Cd hint.pcf.0.irq="5"
 .Pp
 For one or more iicbus busses:
 .Cd "device iicbus"
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index a1668f5..9caec04 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -33,7 +33,12 @@
 .Nm scd
 .Nd Sony CDU31/33 CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device scd0 at isa? port 0x230"
+.Cd "device scd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.scd.0.at="isa"
+.Cd hint.scd.0.port="0x230"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 289811e..ffb104a 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -37,8 +37,15 @@
 .Nm sr
 .Nd synchronous RISCom/N2 / WANic 400/405 device driver
 .Sh SYNOPSIS
-.Cd "device sr0 at isa? port 0x300 irq 10 iomem 0xd0000"
-.Cd "device sr1 at isa? port 0x310 irq 11 flags 0x1 iomem 0xd0000"
+.Cd "device sr"
+.Pp
+For ISA cards, in
+.Pa /boot/device.hints :
+.Cd hint.sr.0.at="isa"
+.Cd hint.sr.0.port="0x300"
+.Cd hint.sr.0.irq="10"
+.Cd hint.sr.0.maddr="0xd0000"
+.Cd hint.sr.0.flags="0x0"
 .Pp
 .Cd "device sppp"
 .Sh DESCRIPTION
@@ -47,6 +54,16 @@ The
 driver supports the RISCom/N2 ISA cards and the WANic 400/405 PCI cards
 that is based on the HD64570 chip.
 .Pp
+If you have ISA cards, you need to specify the resources for them in
+.Pa /boot/device.hints .
+If you have the second ISA card, add
+.Pp
+.Dl hint.sr.1.at="isa"
+.Dl hint.sr.1.port="0x310"
+.Dl hint.sr.1.irq="11"
+.Dl hint.sr.1.maddr="0xd0000"
+.Dl hint.sr.1.flags="0x0"
+.Pp
 The standard
 .Fx
 sppp code is used for the link level layer.
@@ -64,7 +81,9 @@ Alternately, the driver can be compiled to support
 .Pp
 The
 .Em flags
-field is optional.
+specification in
+.Pa /boot/device.hints
+is optional.
 If it isn't specified, the driver will
 assume the following:
 .Pp
@@ -87,12 +106,6 @@ Use separate external clocks for transmit and receive on port 0.
 .It Em 0x40
 Use separate external clocks for transmit and receive on port 1.
 .El
-.Sh NUMBERING
-Only one line for each card is needed in the kernel configuration file.
-The first card's ports will be installed from sr0. The numbering of the
-next card will continue where the first stopped, eg. if the first card
-is a two port card it will use sr0 and sr1. The next card will then
-start at sr2.
 .Pp
 The card only supports IRQ 3, 4, 5, 7, 10, 11, 12 and 15.
 .Pp
diff --git a/share/man/man4/man4.i386/wt.4 b/share/man/man4/man4.i386/wt.4
index dbe8391..4700b4f 100644
--- a/share/man/man4/man4.i386/wt.4
+++ b/share/man/man4/man4.i386/wt.4
@@ -30,7 +30,14 @@
 .Nm wt
 .Nd Archive/Wangtek cartridge tape driver
 .Sh SYNOPSIS
-.Cd "device wt0 at isa? port 0x300 irq 5 drq 1"
+.Cd "device wt 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.wt.0.at="isa"
+.Cd hint.wt.0.port="0x300"
+.Cd hint.wt.0.irq="5"
+.Cd hint.wt.0.drq="1"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index c192899..41d06db 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -35,7 +35,6 @@
 .Nd CAM application passthrough driver
 .Sh SYNOPSIS
 .Cd device pass
-.Cd device pass2 at scbus0 target 3 unit 0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index f78cb87..0046e1a 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -36,8 +36,13 @@
 For a card with bridge driver support, and a PnP card:
 .Cd "device pcm"
 .Pp
-For a card without bridge driver support, and a non-PnP card:
-.Cd "device pcm0 at isa? port? irq 5 drq 1 flags 0x15"
+For a card without bridge driver support, and a non-PnP card,
+the following lines may be required in
+.Pa /boot/device.hints :
+.Cd hint.pcm.0.at="isa"
+.Cd hint.pcm.0.irq="5"
+.Cd hint.pcm.0.drq="1"
+.Cd hint.pcm.0.flags="0x0"
 .Sh DESCRIPTION
 The
 .Nm
@@ -63,13 +68,15 @@ They also happen to be
 among the cheapest audio cards on the market.
 .Pp
 The driver does its best to recognize the installed hardware and drive
-it correctly, so that you don't have to give too many details in the
-kernel config files.
+it correctly, so that you don't have to give too many details in
+.Pa /boot/device.hints .
 For PCI and ISA PnP cards this is actually easy
 since they identify themselves.
 For legacy ISA cards, the driver looks
 for MSS cards at addresses 0x530 and 0x604 (obviously, unless overridden
-in the kernel config file by specifying an address).
+in
+.Pa /boot/device.hints
+).
 .Sh IOCTL
 The driver supports most of the Voxware ioctls(), and most
 applications work unmodified (including popular mpeg players and linux
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 33bd28b..f966bfb 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -45,7 +45,11 @@
 .Nm vt
 .Nd VT220 virtual screen system console
 .Sh SYNOPSIS
-.Cd "device vt0 at isa?"
+.Cd "device vt0"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.vt.0.at="isa"
 .Sh DESCRIPTION
 .Ss Overview
 The
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 356b808..3d32c46 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -37,7 +37,12 @@
 .Cd "options KBD_MAXWAIT=N"
 .Cd "options PSM_DEBUG=N"
 .Cd "options KBDIO_DEBUG=N"
-.Cd "device psm0 at atkbdc? irq 12"
+.Cd "device psm"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.psm.0.at="atkbdc"
+.Cd hint.psm.0.irq="12"
 .Sh DESCRIPTION
 The
 .Nm
@@ -230,11 +235,11 @@ for debug logging.
 The
 .Nm
 driver accepts the following driver flags.
-Set them in the
-kernel configuration file or in the User Configuration Menu at
-the boot time
+Set them in
+.Pa /boot/device.hints
 (see
-.Xr boot 8 ) .
+.Sx EXAMPLES
+below).
 .Pp
 .Bl -tag -width MOUSE
 .It bit 0..3 RESOLUTION
@@ -627,16 +632,33 @@ movement counts as described in
 .Em devfs .
 .El
 .Sh EXAMPLES
-.Dl "device psm0 at atkbdc? irq 12 flags 0x2000"
-.Pp
-Add the
+In order to install the
 .Nm
-driver to the kernel with the optional code to stimulate the pointing device
+driver, you need to add
+.Pp
+.Dl "device atkbdc"
+.Dl "device psm"
+.Pp
+to your kernel configuration file, and put the following lines to
+.Pa /boot/device.hints .
+.Pp
+.Dl hint.atkbdc.0.at="isa"
+.Dl hint.atkbdc.0.port="0x060"
+.Dl hint.psm.0.at="atkbdc"
+.Dl hint.psm.0.irq="12"
+.Pp
+If you add the following statement to
+.Pa /boot/device.hints ,
+.Pp
+.Dl hint.psm.0.flags="0x2000"
+.Pp
+you will add the optional code to stimulate the pointing device
 after the `resume' event.
 .Pp
-.Dl "device psm0 at atkbdc? flags 0x024 irq 12"
+.Dl hint.psm.0.flags="0x24"
 .Pp
-Set the device resolution high (4) and the acceleration factor to 2.
+The above line will set the device resolution high (4)
+and the acceleration factor to 2.
 .Sh DIAGNOSTICS
 At debug level 0, little information is logged except for the following
 line during boot process:
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index bab0880..81ef4e7 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -33,7 +33,6 @@
 .Nd SCSI processor type driver
 .Sh SYNOPSIS
 .Cd device pt
-.Cd device pt1 at scbus0 target 3 unit 0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index 3ce8491..b1fc6f6 100644
--- a/share/man/man4/rp.4
+++ b/share/man/man4/rp.4
@@ -10,7 +10,11 @@
 .Nd "driver for Comtrol RocketPort Intelligent Serial Port Cards"
 .Sh SYNOPSIS
 .Cd "device rp"
-.Cd "device rp0 at isa? port 0x180"
+.Pp
+For ISA cards, you must specify the port address in
+.Pa /boot/device.hints :
+.Cd hints.rp.0.at="isa"
+.Cd hints.rp.0.port="0x100"
 .Sh DESCRIPTION
 This driver provides a kernel device driver for the
 .Tn RocketPort
@@ -68,8 +72,8 @@ including other
 .Tn RocketPort
 cards.
 The starting range of the I/O ports used by each card
-must match with the I/O address specified in the kernel
-configuration file.
+must match with the I/O address specified in
+.Pa /boot/device.hints .
 .Pp
 Since the first
 .Tn RocketPort
@@ -83,6 +87,15 @@ since the first three I/O addresses of that range
 are used by the first board.
 This is an important point to keep in mind.
 .Pp
+If you have two ISA cards, one installed at 0x100 and the
+second installed at 0x180, then you should add the following to
+.Pa /boot/device.hints :
+.Pp
+.Dl hints.rp.0.at="isa"
+.Dl hints.rp.0.port="0x100"
+.Dl hints.rp.1.at="isa"
+.Dl hints.rp.1.port="0x180"
+.Pp
 The configuration of the
 .Tn RocketPort
 cards is done via the set of 8 DIP switches,
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 15970b0..9bf36f0 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -33,7 +33,6 @@
 .Nd SCSI Sequential Access device driver
 .Sh SYNOPSIS
 .Cd device sa
-.Cd device sa1 at scbus0 target 4 unit 0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/sbc.4 b/share/man/man4/sbc.4
index 69eb3a0..f4ae6ec 100644
--- a/share/man/man4/sbc.4
+++ b/share/man/man4/sbc.4
@@ -32,11 +32,15 @@
 .Nm sbc
 .Nd Creative Sound Blaster ISA and compatible bridge device driver
 .Sh SYNOPSIS
-For PnP cards:
 .Cd "device sbc"
 .Pp
-For non-PnP cards:
-.Cd "device sbc0 at isa? port 0x220 irq 5 drq 1 flags 0x15"
+Non-PnP cards requires the following lines in
+.Pa /boot/device.hints :
+.Cd hint.sbc.0.at="isa"
+.Cd hint.sbc.0.port="0x220"
+.Cd hint.sbc.0.irq="5"
+.Cd hint.sbc.0.drq="1"
+.Cd hint.sbc.0.flags="0x15"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 1e9dd0f..4e25a20 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -33,16 +33,13 @@
 .Nd CAM SCSI subsystem
 .Sh SYNOPSIS
 .Cd "device scbus"
-.Cd "device scbus1 at ahc0"
-.Cd "device scbus3 at ahc1 bus 0"
-.Cd "device scbus2 at ahc1 bus 1"
 .Cd "device cd"
 .Cd "device ch"
 .Cd "device da"
 .Cd "device pass"
 .Cd "device pt"
 .Cd "device sa"
-.Cd "device ch1 at scbus0 target 4 unit 0"
+.Cd "device ch"
 .Cd "options CAMDEBUG"
 .Cd "options CAM_DEBUG_BUS=-1"
 .Cd "options CAM_DEBUG_TARGET=-1"
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 8a3879d..d2260bb 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -7,14 +7,16 @@
 .Nd "driver for Specialix International SI/XIO or SX intelligent serial card"
 .Sh SYNOPSIS
 .Cd "device si"
-.Cd "device si0 at isa? irq 12 iomem 0xd0000"
+.Pp
+For ISA host cards put the following lines in
+.Pa /boot/device.hints :
+.Cd hint.si.0.at="isa"
+.Cd hint.si.0.maddr="0xd0000"
+.Cd hint.si.0.irq="12"
 .Sh DESCRIPTION
 The Specialix SI/XIO and SX hardware makes up an 8 to 32 port RS-232 serial
 multiplexor.
 .Pp
-The first instance of the device lines above is for EISA and PCI host cards,
-the second is for ISA host cards.
-.Pp
 The system uses two components:  A "Host adapter", which is plugged into
 an ISA, EISA or PCI slot and provides intelligence and buffering/processing
 capabilities, as well as an external bus in the form of a 37 pin cable.
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index b6109d5..ba0b2b2 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -44,34 +44,71 @@
 .Nd "fast interrupt driven asynchronous serial communications interface"
 .Sh SYNOPSIS
 For standard ISA ports:
-.Cd "device sio0 at isa? port IO_COM1 irq 4"
-.Cd "device sio1 at isa? port IO_COM2 irq 3"
-.Cd "device sio2 at isa? port IO_COM3 irq 5"
-.Cd "device sio3 at isa? port IO_COM4 irq 9"
+.Cd "device sio"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.sio.0.at="isa"
+.Cd hint.sio.0.port="0x3f8"
+.Cd hint.sio.0.flags="0x10"
+.Cd hint.sio.0.irq="4"
+.Cd hint.sio.1.at="isa"
+.Cd hint.sio.1.port="0x2f8"
+.Cd hint.sio.1.flags="0x0"
+.Cd hint.sio.1.irq="3"
 .Pp
 For AST compatible multiport cards with 4 ports:
 .Cd "options COM_MULTIPORT"
-.Cd "device sio4 at isa? port 0x2a0 flags 0x701"
-.Cd "device sio5 at isa? port 0x2a8 flags 0x701"
-.Cd "device sio6 at isa? port 0x2b0 flags 0x701"
-.Cd "device sio7 at isa? port 0x2b8 flags 0x701 irq 12"
+.Cd "device sio"
+.Pp
+The lines in
+.Pa /boot/device.hints
+should be:
+.Cd hint.sio.4.at="isa"
+.Cd hint.sio.4.port="0x2a0"
+.Cd hint.sio.4.flags="0x701"
+.Cd hint.sio.5.at="isa"
+.Cd hint.sio.5.port="0x2a8"
+.Cd hint.sio.5.flags="0x701"
+.Cd hint.sio.6.at="isa"
+.Cd hint.sio.6.port="0x2b0"
+.Cd hint.sio.6.flags="0x701"
+.Cd hint.sio.7.at="isa"
+.Cd hint.sio.7.port="0x2b8"
+.Cd hint.sio.7.flags="0x701"
+.Cd hint.sio.7.irq="12"
 .Pp
 For Boca Board compatible multiport cards with 8 ports:
 .Cd "options COM_MULTIPORT"
-.Cd "device sio4 at isa? port 0x100 flags 0xb05"
+.Cd "device sio"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.sio.4.at="isa"
+.Cd hint.sio.4.port="0x100"
+.Cd hint.sio.4.flags="0xb05"
 .Cd "..."
-.Cd "device sio11 at isa? port 0x138 flags 0xb05 irq 12"
+.Cd hint.sio.11.at="isa"
+.Cd hint.sio.11.port="0x138"
+.Cd hint.sio.11.flags="0xb05"
+.Cd hint.sio.11.irq="12"
 .Pp
 For Hayes ESP cards:
 .Cd "options COM_ESP"
+.Cd "device sio"
 .Cd "..."
 .Pp
-For PCI and PCCARD cards:
+For PCI and PCCARD cards, nolines are required in
+.Pa /boot/device.hints .
 .Cd "device sio"
 .Pp
 For dual port PCI cards that share an interrupt:
-.Cd "device sio2 at pci? flags 0x201"
-.Cd "device sio3 at pci? flags 0x201"
+.Cd "device sio"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.sio.2.flags="0x201"
+.Cd hint.sio.3.flags="0x201"
 .Pp
 Meaning of
 .Ar flags :
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 5a788a2..705c53d 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -32,11 +32,16 @@
 .Nm gusc
 .Nd Gravis UltraSound ISA bridge device driver
 .Sh SYNOPSIS
-For PnP cards:
+.Cd "device pcm"
 .Cd "device gusc"
 .Pp
-For non-PnP cards:
-.Cd "device gusc0 at isa? port 0x220 irq 5 drq 1 flags 0x13"
+For non-PnP cards, add the following lines in
+.Pa /boot/device.hints .
+.Cd hint.gusc.0.at="isa"
+.Cd hint.gusc.0.port="0x220"
+.Cd hint.gusc.0.irq="5"
+.Cd hint.gusc.0.drq="1"
+.Cd hint.gusc.0.flags="0x13"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 69eb3a0..f4ae6ec 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -32,11 +32,15 @@
 .Nm sbc
 .Nd Creative Sound Blaster ISA and compatible bridge device driver
 .Sh SYNOPSIS
-For PnP cards:
 .Cd "device sbc"
 .Pp
-For non-PnP cards:
-.Cd "device sbc0 at isa? port 0x220 irq 5 drq 1 flags 0x15"
+Non-PnP cards requires the following lines in
+.Pa /boot/device.hints :
+.Cd hint.sbc.0.at="isa"
+.Cd hint.sbc.0.port="0x220"
+.Cd hint.sbc.0.irq="5"
+.Cd hint.sbc.0.drq="1"
+.Cd hint.sbc.0.flags="0x15"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 62b990d..2cf11fc 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -55,7 +55,11 @@
 .Cd "options SC_KERNEL_CONS_REV_ATTR=_attribute_"
 .Cd "options SC_DFLT_FONT"
 .Cd "makeoptions SC_DFLT_FONT=_font_name_"
-.Cd "device sc0 at isa?" Op flags Ar flags
+.Cd "device sc"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.sc.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
@@ -375,13 +379,10 @@ option too.
 The following driver flags can be used to control the
 .Nm
 driver.
-They can be set either in the kernel configuration file
-(see
-.Xr config 8 ) ,
-or else in the User Configuration Menu at boot
-time
-(see
-.Xr boot 8 ) .
+They can be set either in
+.Pa /boot/device.hints ,
+or else at the loader prompt (see
+.Xr loader 8 ) .
 .Bl -tag -width bit_0
 .\".It bit 0 (VISUAL_BELL)
 .\"Uses the ``visual'' bell.
@@ -440,13 +441,24 @@ driver requires the keyboard driver and the video card driver,
 the kernel configuration file should contain the following lines.
 .Pp
 .Bd -literal -offset indent
-device atkbdc0 at isa? port IO_KBD
-device atkbd0 at atkbdc? irq 1
-device vga0 at isa? conflicts
-device sc0 at isa?
+device atkbdc
+device atkbd
+device vga
+device sc
 
 device splash
 .Ed
+You also need the following lines in
+.Pa /bood/device.hints
+for these drivers.
+.Bd -literal -offset indent
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+.Ed
 .Pp
 If you do not intend to load the splash image or use the screen saver,
 the last line is not necessary, and can be omitted.
@@ -482,7 +494,7 @@ to the kernel.
 .Pp
 .Dl "options SC_DFLT_FONT"
 .Dl "makeoptions SC_DFLT_FONT=cp850
-.Dl "device sc0 at isa?
+.Dl "device sc"
 .Pp
 .\".Sh DIAGNOSTICS
 .Sh CAVEATS
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index e7bb8cd..42569ff 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -40,7 +40,11 @@
 .Cd "options VGA_NO_MODE_CHANGE"
 .Cd "options VGA_SLOW_IOACCESS"
 .Cd "options VGA_WIDTH90"
-.Cd "device vga0 at isa? port ? conflicts"
+.Cd "device vga"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.vga.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
@@ -131,13 +135,18 @@ This option prevents the driver from changing video modes.
 .Sh EXAMPLES
 Your kernel configuration should normally have:
 .Pp
-.Dl "device vga0 at isa? port ? conflicts"
+.Dl "device vga"
+.Pp
+And you need the following line in
+.Pa /boot/device.hints .
+.Pp
+.Dl hint.vga.0.at="isa"
 .Pp
 The following lines should be included in the kernel configuration file
 in order to enable the VESA BIOS Extension support.
 .Pp
 .Dl "options VESA"
-.Dl "device vga0 at isa? port ? conflicts"
+.Dl "device vga"
 .Pp
 If you do not want VESA support included in the kernel, but
 want to use occasionally, do not add the
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index c79fc6b..58a7773 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -34,7 +34,7 @@
 .Cd "device vpo"
 .Pp
 For one or more SCSI busses:
-.Cd "device scbus0 at vpo0"
+.Cd "device scbus"
 .Sh DESCRIPTION
 The primary purpose of the
 .Em vpo