39 files changed, 254 insertions, 442 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index a72ef2611c95..894e555eae03 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,25 +1,33 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 # $FreeBSD$
 
-MAN4=	alpm.4 bpf.4 bridge.4 ccd.4 cd.4 ch.4 da.4 ddb.4 divert.4 drum.4 \
-	dummynet.4 fd.4 fpa.4 \
+MAN4=	ahc.4 al.4 alpm.4 atkbd.4 atkbdc.4 ax.4 bpf.4 bridge.4 ccd.4 \
+	cd.4 ch.4 da.4 ddb.4 divert.4 de.4 drum.4 \
+	dummynet.4 fd.4 fdc.4 fpa.4 fxp.4 \
 	icmp.4 ifmib.4 iic.4 iicbb.4 iicbus.4 iicsmb.4 \
-	imm.4 inet.4 intpm.4 intro.4 ip.4 ipfirewall.4 kld.4 \
-	lkm.4 lo.4 lp.4 lpbb.4 natm.4 netintro.4 nlpt.4 \
-	null.4 pass.4 ppbus.4 ppi.4 ppp.4 pt.4 pty.4 \
-	route.4 sa.4 scsi.4 \
-	sd.4 sl.4 smb.4 smbus.4 smp.4 snp.4 sppp.4 ssc.4 st.4 su.4 tcp.4 \
-	termios.4 ttcp.4 tty.4 tun.4 udp.4 uk.4 unix.4 update.4 vinum.4 vn.4 \
-	vpo.4 worm.4 wst.4 xpt.4 yp.4 zero.4
+	imm.4 inet.4 intpm.4 intro.4 ip.4 ipfirewall.4 keyboard.4 kld.4 \
+	lkm.4 lo.4 lp.4 lpbb.4 mem.4 mouse.4 mtio.4 mx.4 natm.4 ncr.4 \
+	netintro.4 nlpt.4 \
+	null.4 pass.4 pcm.4 pcvt.4 pn.4 ppbus.4 ppi.4 ppp.4 psm.4 pt.4 pty.4 \
+	route.4 rl.4 sa.4 screen.4 scsi.4 \
+	sd.4 sf.4 si.4 sio.4 sis.4 sk.4 sl.4 smb.4 smbus.4 smp.4 snp.4 \
+	splash.4 sppp.4 ssc.4 st.4 ste.4 su.4 syscons.4 sysmouse.4 tcp.4 \
+	termios.4 ti.4 tl.4 ttcp.4 tty.4 tun.4 udp.4 uk.4 ukbd.4 ums.4 \
+	unix.4 update.4 usb.4 vga.4 vinum.4 vn.4 vr.4 \
+	vpo.4 worm.4 wb.4 wst.4 xl.4 xpt.4 yp.4 zero.4
 
 MLINKS= bpf.4 bpfilter.4
 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
 MLINKS+=fpa.4 fea.4
 MLINKS+=ipfirewall.4 ipacct.4 ipfirewall.4 ipfw.4 ipfirewall.4 ipaccounting.4
 MLINKS+=lp.4 plip.4
+MLINKS+=mem.4 kmem.4
 MLINKS+=netintro.4 networking.4
+MLINKS+=pcvt.4 vt.4
 MLINKS+=scsi.4 cam.4
 MLINKS+=smp.4 SMP.4
+MLINKS+=splash.4 screensaver.4
+MLINKS+=syscons.4 sc.4
 MLINKS+=vpo.4 imm.4
 MLINKS+=yp.4 YP.4 yp.4 nis.4 yp.4 NIS.4
 
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 4308f8fd5247..f50ce76aa7a3 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd October 15, 1998
-.Dt AHC 4
+.Dt AHC 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ahc
@@ -241,7 +241,7 @@ The
 .Nm
 driver, the
 .Tn AIC7xxx
-sequencer-code assembler,
+sequencer-code assember,
 and the firmware running on the aic7xxx chips was written by
 .An Justin T. Gibbs .
 .Sh HISTORY
diff --git a/share/man/man4/al.4 b/share/man/man4/al.4
index f2094db63421..57e86b650b53 100644
--- a/share/man/man4/al.4
+++ b/share/man/man4/al.4
@@ -31,11 +31,12 @@
 .\" $FreeBSD$
 .\"
 .Dd May 20, 1999
-.Dt AL 4
+.Dt AL 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm al
-.Nd ADMtek Inc. AL981 Comet and AN985 Centaur fast ethernet device driver
+.Nd
+ADMtek Inc. AL981 Comet and AN985 Centaur fast ethernet device driver
 .Sh SYNOPSIS
 .Cd "device al0"
 .Sh DESCRIPTION
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index bbf2dd9fc80e..9a12804e65f3 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -1,3 +1,4 @@
+.\" t
 .\"
 .\" Copyright (c) 1999
 .\" Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
@@ -27,16 +28,17 @@
 .\" $FreeBSD$
 .\"
 .Dd May 21, 1999
-.Dt ATKBD 4
+.Dt ATKBD 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm atkbd
-.Nd the AT keyboard interface
+.Nd
+the AT keyboard interface
 .Sh SYNOPSIS
 .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 atkbd0 at isa? tty irq 1"
 .Sh DESCRIPTION
 The
 .Nm
@@ -66,50 +68,33 @@ by the
 .Xr kbdcontrol 1
 command.
 .Pp
-.Bl -tag -width "Function Key Number" -compact -offset
-.It "Function Key number"
-Function Key
-.It "1, 2,...12"
-F1, F2,... F12
-.It "13, 14,...24"
-Shift+F1, Shift+F2,... Shift+F12
-.It "25, 26,...36"
-Ctl+F1, Ctl+F2,... Ctl+F12
-.It "37, 38,...48"
-Shift+Ctl+F1, Shift+Ctl+F2,... Shift+Ctl+F12
-.It 49
-Home and Numpad 7 (without NumLock)
-.It 50
-Up Arrow and Numpad 8 (without NumLock)
-.It 51
-Page Up and Numpad 9 (without NumLock)
-.It 52
-Numpad -
-.It 53
-Left Arrow and Numpad 4 (without NumLock)
-.It 54
-Numpad 5 (without NumLock)
-.It 55
-Right Arrow and Numpad 6 (without NumLock)
-.It 56
-Numpad + 
-.It 57
-End and Numpad 1 (without NumLock)
-.It 58
-Down Arrow and Numpad 2 (without NumLock)
-.It 59
-Page Down and Numpad 3 (without NumLock)
-.It 60
-Ins and Numpad 0 (without NumLock)
-.It 61
-Del
-.It 62
-Left GUI Key
-.It 63
-Right GUI Key
-.It 64
-Menu
-.El
+.TS
+c c
+c c
+r l.
+Function Key Number	Function Key
+-------------------	-----------------------------------------------
+1, 2,...12	F1, F2,... F12
+13, 14,...24	Shift+F1, Shift+F2,... Shift+F12
+25, 26,...36	Ctl+F1, Ctl+F2,... Ctl+F12
+37, 38,...48	Shift+Ctl+F1, Shift+Ctl+F2,... Shift+Ctl+F12
+49	Home and Numpad 7 (without NumLock)
+50	Up Arrow and Numpad 8 (without NumLock)
+51	Page Up and Numpad 9 (without NumLock)
+52	Numpad -
+53	Left Arrow and Numpad 4 (without NumLock)
+54	Numpad 5 (without NumLock)
+55	Right Arrow and Numpad 6 (without NumLock)
+56	Numpad + 
+57	End and Numpad 1 (without NumLock)
+58	Down Arrow and Numpad 2 (without NumLock)
+59	Page Down and Numpad 3 (without NumLock)
+60	Ins and Numpad 0 (without NumLock)
+61	Del
+62	Left GUI Key
+63	Right GUI Key
+64	Menu
+.TE
 .Pp
 See the man page for the
 .Xr kbdcontrol 1
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index ed3d6de2fb0d..af5e4e802135 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 9, 1999
-.Dt ATKBDC 4
+.Dt ATKBDC 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm atkbdc
@@ -37,7 +37,7 @@ the AT keyboard controller interface
 .Cd "options" \&"KBD_RESETDELAY=N\&"
 .Cd "options" \&"KBD_MAXWAIT=N\&"
 .Cd "options" \&"KBDIO_DEBUG=N\&"
-.Cd "controller atkbdc0 at isa? port IO_KBD"
+.Cd "controller atkbdc0 at isa? port IO_KBD tty"
 .Sh DESCRIPTION
 The keyboard controller
 .Nm
diff --git a/share/man/man4/ax.4 b/share/man/man4/ax.4
index 6056f1a374f4..f0c396cbd7e8 100644
--- a/share/man/man4/ax.4
+++ b/share/man/man4/ax.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 2, 1999
-.Dt AX 4
+.Dt AX 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ax
@@ -55,7 +55,7 @@ using two special registers where as the DEC chip is programmed
 by uploading a special setup frame via the transmit DMA engine.
 The ASIX receive filter can only be programmed with a single
 perfect filter entry for the local station address and a 64-bit
-multicast hash table; the DEC filter supports several other
+multicast hash table; the DEC filter has supports several other
 options. The ASIX fast ethernet controller supports both
 10 and 100Mbps speeds in either full or half duplex using
 an external MII transceiver.
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index 9ea71440ae9c..938d09fff693 100644
--- a/share/man/man4/de.4
+++ b/share/man/man4/de.4
@@ -26,11 +26,12 @@
 .\" $FreeBSD$
 .\"
 .Dd January 19, 1997
-.Dt DE 4
+.Dt DE 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm de
-.Nd DEC DC21x4x Ethernet device driver
+.Nd
+DEC DC21x4x Ethernet device driver
 .Sh SYNOPSIS
 .Cd "device de0"
 .Sh DESCRIPTION
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 97348c1ca653..bae8e04f82fd 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd August 31, 1994
-.Dt FDC 4
+.Dt FDC 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm fdc
@@ -41,8 +41,7 @@ PC architecture floppy disk controller driver
 This driver provides access to floppy disk drives and QIC40/80 tapedrives.
 In /dev for each floppy device a number of minor devices are present. The
 /dev/fd* devices with trailing alphabetic characters are used to indicate
-.Sq partitions
-on the floppy disk. The /dev/fd*.<number> are devices that
+'partitions' on the floppy disk. The /dev/fd*.<number> are devices that
 indicate the size of the floppy disk (so: 720kB, 1440kB etc). The latter
 are used for formatting disks using fdformat or for accessing different
 density disks in multidensity drive. Example: 720kB disk in a 1.44Mb drive.
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index d63c70b2abda..fcf673cc1fdc 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 19, 1997
-.Dt FXP 4
+.Dt FXP 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm fxp
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index 1e8c82e0b8a1..575936bd1b11 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -2,7 +2,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 8, 1995
-.Dt KEYBOARD 4
+.Dt KEYBOARD 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm keyboard
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 3dba95e51753..d4cd30c41033 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -33,7 +33,7 @@
 .\" $FreeBSD$
 .\"
 .Dd May 2, 1991
-.Dt MEM 4
+.Dt MEM 4 i386
 .Os
 .Sh NAME
 .Nm mem ,
@@ -70,124 +70,14 @@ is
 .Dv UPAGES
 long, and ends at virtual
 address 0xf0000000.
-.Sh IOCTL INTERFACE
-Several architectures allow attributes to be associated with ranges of physical
-memory.  These attributes can be manipulated via
-.Fn ioctl
-calls performed on
-.Nm /dev/mem .
-Declarations and data types are to be found in
-.Pa <memrange.h>
-.Pp
-The specific attributes, and number of programmable ranges may vary between
-architectures.  The full set of supported attributes is:
-.Bl -tag -width 10
-.It MDF_UNCACHEABLE
-The region is not cached.
-.It MDF_WRITECOMBINE
-Writes to the region may be combined or performed out of order.
-.It MDF_WRITETHROUGH
-Writes to the region are committed synchronously.
-.It MDF_WRITEBACK
-Writes to the region are committed asynchronously.
-.It MDF_WRITEPROTECT
-The region cannot be written to.
-.El
-.Pp
-Memory ranges are described by
-.Fa struct mem_range_desc :
-.Bd -literal -offset indent
-u_int64_t	mr_base;	/\(** physical base address \(**/
-u_int64_t	mr_len;		/\(** physical length of region \(**/
-int		mr_flags;	/\(** attributes of region \(**/
-char		mr_owner[8];
-.Ed
-.Pp
-In addition to the region attributes listed above, the following flags
-may also be set in the
-.Fa mr_flags
-field:
-.Bl -tag -width 10
-.It MDF_FIXBASE
-The region's base address cannot be changed.
-.It MDF_FIXLEN
-The region's length cannot be changed.
-.It MDF_FIRMWARE
-The region is believed to have been established by the system firmare.
-.It MDF_ACTIVE
-The region is currently active.
-.It MDF_BOGUS
-We believe the region to be invalid or otherwise erroneous.
-.It MDF_FIXACTIVE
-The region cannot be disabled.
-.It MDF_BUSY
-The region is currently owned by another process and may not be 
-altered.
-.El
-.Pp
-Operations are performed using
-.Fa struct mem_range_op :
-.Bd -literal -offset indent
-struct mem_range_desc	*mo_desc;
-int			mo_arg[2];
-.Ed
-.Pp
-The
-.Fa MEMRANGE_GET
-ioctl is used to retrieve current memory range attributes. If
-.Fa mo_arg[0]
-is set to 0, it will be updated with the total number of memory range
-descriptors.  If greater than 0, the array at
-.Fa mo_desc
-will be filled with a corresponding number of descriptor structures,
-or the maximum, whichever is less.
-.Pp
-The 
-.Fa MEMRANGE_SET
-ioctl is used to add, alter and remove memory range attributes.  A range
-with the MDF_FIXACTIVE flag may not be removed; a range with the MDF_BUSY
-flag may not be removed or updated.
-.Pp
-.Fa mo_arg[0] 
-should be set to MEMRANGE_SET_UPDATE to update an existing
-or establish a new range, or to MEMRANGE_SET_REMOVE to remove a range.
-.Pp
-.Sh RETURN VALUES
-.Bl -tag -width 10
-.It EOPNOTSUPP
-Memory range operations are not supported on this architecture.
-.It ENXIO
-No memory range descriptors are available (eg. firmware has not enabled
-any).
-.It EINVAL
-The memory range supplied as an argument is invalid or overlaps another
-range in a fashion not supported by this architecture.
-.It EBUSY
-An attempt to remove or update a range failed because the range is busy.
-.It ENOSPC
-An attempt to create a new range failed due to a shortage of hardware
-resources (eg. descriptor slots).
-.It ENOENT
-An attempt to remove a range failed because no range matches the descriptor
-base/length supplued.
-.It EPERM
-An attempt to remove a range failed because the range is permanently
-enabled.
-.El
-.Sh BUGS
-Busy range attributes are not yet managed correctly.
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /dev/mem
 .It Pa /dev/kmem
 .El
-.Sh SEE ALSO
-.Xr memcontrol 8
 .Sh HISTORY
 The
 .Nm mem ,
 .Nm kmem
 files appeared in
 .At v6 .
-The ioctl interface for memory range attributes was added in
-.Fx 3.2 .
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index 714a7c9b0e42..c9db17c79177 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd December 3, 1997
-.Dt MOUSE 4
+.Dt MOUSE 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm mouse
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 18c8ad28f2bb..2c8f795b0393 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -36,7 +36,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 11, 1996
-.Dt MTIO 4
+.Dt MTIO 4 i386
 .Os FreeBSD 2.2
 .Sh NAME
 .Nm mtio
diff --git a/share/man/man4/mx.4 b/share/man/man4/mx.4
index e9e3b2c7f720..6a960416b76f 100644
--- a/share/man/man4/mx.4
+++ b/share/man/man4/mx.4
@@ -31,14 +31,13 @@
 .\" $FreeBSD$
 .\"
 .Dd November 5, 1998
-.Dt MX 4
+.Dt MX 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm mx
 .Nd
 Macronix 98713/98715/98725 fast ethernet device driver
 .Sh SYNOPSIS
-.Cd "controller miibus0"
 .Cd "device mx0"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index 52d22a25d38a..789feb8cac44 100644
--- a/share/man/man4/ncr.4
+++ b/share/man/man4/ncr.4
@@ -24,7 +24,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 10, 1996
-.Dt NCR 4
+.Dt NCR 4 i386
 .Os
 .Sh NAME
 .Nm ncr
@@ -42,5 +42,6 @@ driver provides support for the NCR/Symbios 53C810, 53C810a,
 .Xr ch 4 ,  
 .Xr da 4 ,
 .Xr intro 4 ,
+.Xr nca 4 ,
 .Xr sa 4 ,
 .Xr scsi 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 78f1831dde1e..a29c552d80f7 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -26,13 +26,13 @@
 .\" $FreeBSD$
 .\"
 .Dd June 3, 1998
-.Dt PCM 4
+.Dt PCM 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm pcm
 .Nd FreeBSD audio device driver
 .Sh SYNOPSIS
-.Cd "device pcm0 at isa? port? irq 5 drq 1 flags 0x15"
+.Cd "device pcm0 at isa? port? tty irq 5 drq 1 flags 0x15"
 .Sh DESCRIPTION
 The
 .Nm pcm
@@ -48,9 +48,7 @@ channel, or to 0x10 + C to specify channel C.
 .Pp
 PnP audio cards are also supported using the
 .Nm pnp
-support which is available in
-.Fx
-starting from release 2.2.6.
+support which is available in FreeBSD starting from release 2.2.6.
 See the
 .Xr pnp 4
 manpage for more information. In particular, remember that unit
@@ -62,15 +60,18 @@ So, if you have the following line in your kernel config file:
 .Pp
 .Cd "device pcm0 ..."
 .Pp
-your first PnP audio card will be unit #1, i.e. it will be accessible as
-.Pa /dev/audio1 ,
-.Pa /dev/dsp1 ,
-etc.
-Many applications default to using /dev/audio, but appropriate
-symlinks will be created as a side-effect of the the following command:
+your first PnP audio card will be unit #1, i.e. it will be accessible
+as /dev/audio1, /dev/dsp1, etc.
+Many application default to using /dev/audio, so you can create
+symlinks from /dev/audio etc to the correct device entries as follows:
 .Pp
 .Cd cd /dev
+.Cd rm audio dsp dspW mixer
 .Cd ./MAKEDEV snd1
+.Cd ln -s audio1 audio
+.Cd ln -s dsp1 dsp
+.Cd ln -s dspW1 dspW
+.Cd ln -s mixer1 mixer
 .Pp
 The driver works best with WSS/MSS cards, which have a very clean
 architecture and an orthogonal set of features. They also happen to be
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index c4eb0183b9ec..c55e672c32bf 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -43,7 +43,7 @@
 .\" removed references to 386BSD (-hm)
 .\"
 .Dd February 27, 1994
-.Dt PCVT 4
+.Dt PCVT 4 i386
 .Sh NAME
 .Nm pcvt ,
 .Nm vt
@@ -65,7 +65,7 @@ see
 below
 .Pc
 .Pp
-.Cd "device vt0 at isa?"
+.Cd "device vt0 at isa? tty"
 .Sh DESCRIPTION
 .Ss Overview
 The
diff --git a/share/man/man4/pn.4 b/share/man/man4/pn.4
index d48e6616cd9e..77bc6d98641d 100644
--- a/share/man/man4/pn.4
+++ b/share/man/man4/pn.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 7, 1998
-.Dt PN 4
+.Dt PN 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm pn
@@ -46,8 +46,8 @@ driver provides support for PCI ethernet adapters and embedded
 controllers based on the Lite-On 82c168 and 82c169 fast ethernet
 controller chips. This includes the LinkSys LNE100TX, the
 Bay Networks Netgear FA310TX revision D1, the Matrox Networks
-FastNIC 10/100, the Kingston KNE110TX (EtherRx VP),
-and various other commodity fast ethernet cards.
+FastNIC 10/100, certain adapters manufactured by D-Link and
+Trendware, and various other commodity fast ethernet cards.
 .Pp
 The Lite-On chips use bus master DMA and are designed to be
 DEC 'tulip' workalikes. Many vendors that formerly based their
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 1f1eebad31d1..78034eb2837c 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 30, 1999
-.Dt PSM 4
+.Dt PSM 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm psm
@@ -40,7 +40,7 @@ PS/2 mouse style pointing device driver
 .Cd "options" \&"KBD_MAXWAIT=N\&"
 .Cd "options" \&"PSM_DEBUG=N\&"
 .Cd "options" \&"KBDIO_DEBUG=N\&"
-.Cd "device psm0 at atkbdc? irq 12"
+.Cd "device psm0 at isa? tty irq 12"
 .Sh DESCRIPTION
 The
 .Nm
@@ -601,14 +601,14 @@ movement counts as described in
 .El
 .Sh EXAMPLE
 .Dl "options" \&"PSM_HOOKAPM\&"
-.Dl "device psm0 at atkbdc? irq 12"
+.Dl "device psm0 at isa? tty irq 12"
 .Pp
 Add the
 .Nm
 driver to the kernel with the optional code to stimulate the pointing device
 after the `resume' event.
 .Pp
-.Dl "device psm0 at atkbdc? flags 0x024 irq 12"
+.Dl "device psm0 at isa? tty flags 0x024 irq 12"
 .Pp
 Set the device resolution high (4) and the acceleration factor to 2.
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index f3830ef35f7c..84c9b91c11e5 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 4, 1998
-.Dt RL 4
+.Dt RL 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm rl
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index fe06591c4a05..be40d4fcb03d 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -2,7 +2,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 8, 1995
-.Dt SCREEN 4
+.Dt SCREEN 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm screen
@@ -12,8 +12,7 @@
 Access to the
 .Ar virtual consoles 
 are obtained through the device files
-ttyv0 - ttyvb in
-.Pa /dev .
+ttyv0 - ttyvb in /dev.
 Each of these files correspond to a separate
 virtual console.
 All virtual console devices can be open at once, but only one is 
@@ -23,9 +22,8 @@ display screen.
 Output to a virtual console that not currently is on the display is
 saved in a buffer that holds a "screenfull" (normally 25) lines.
 Any output written to 
-.Pa /dev/console 
-(the original console device) is echoed to
-.Pa /dev/ttyv0.
+.Ar /dev/console 
+(the original console device) is echoed to /dev/ttyv0.
 .Pp
 To switch between the virtual consoles one uses the sequence 
 .Ar ALT+Fn
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 892bcc7bc679..97629e0b035e 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 22, 1999
-.Dt SF 4
+.Dt SF 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm sf
@@ -146,8 +146,8 @@ the network connection (cable).
 .Xr netintro 4 , 
 .Xr ifconfig 8 ,
 .Rs
-.%T The Adaptec AIC-6915 Programmer's Manual
-.%O ftp://ftp.adaptec.com/pub/BBS/userguides/aic6915_pg.pdf
+.%T The Adaptec AIC-6915 programming manual
+.%O http://www.adaptec.com
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 914f195cb69a..fb6f42a5eb70 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,13 +1,13 @@
 .\" $FreeBSD$
 .Dd September 16, 1995
 .Os FreeBSD
-.Dt SI 4
+.Dt SI 4 i386
 .Sh NAME
 .Nm si
 .Nd Driver for Specialix International SI/XIO or SX intelligent serial card.
 .Sh SYNOPSIS
 .Cd "device si0"
-.Cd "device si0 at isa? irq 12 iomem 0xd0000"
+.Cd "device si0 at isa? tty irq 12 iomem 0xd0000"
 .Sh DESCRIPTION
 The Specialix SI/XIO and SX hardware makes up an 8 to 32 port RS-232 serial
 multiplexor.
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index a4c23db4472b..d4d575fde979 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -37,7 +37,7 @@
 .\" $FreeBSD$
 .\"
 .Dd October 10, 1995
-.Dt SIO 4
+.Dt SIO 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm sio
@@ -45,23 +45,23 @@
 fast interrupt driven asynchronous serial communications interface
 .Sh SYNOPSIS
 For standard 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 sio0 at isa? port" \&"IO_COM1\&" tty irq 4
+.Cd "device sio1 at isa? port" \&"IO_COM2\&" tty irq 3
+.Cd "device sio2 at isa? port" \&"IO_COM3\&" tty irq 5
+.Cd "device sio3 at isa? port" \&"IO_COM4\&" tty irq 9
 .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 sio4 at isa? port 0x2a0 tty flags 0x701"
+.Cd "device sio5 at isa? port 0x2a8 tty flags 0x701"
+.Cd "device sio6 at isa? port 0x2b0 tty flags 0x701"
+.Cd "device sio7 at isa? port 0x2b8 tty flags 0x701 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 sio4 at isa? port 0x100 tty flags 0xb05"
 .Cd "..."
-.Cd "device sio11 at isa? port 0x138 flags 0xb05 irq 12"
+.Cd "device sio11 at isa? port 0x138 tty flags 0xb05 irq 12"
 .Pp
 For Hayes ESP cards:
 .Cd "options" \&"COM_ESP\&"
@@ -84,8 +84,6 @@ device is potential system console
 device is forced to become system console
 .It 0x00040
 device is reserved for low-level IO (e. g. for remote kernel debugging)
-.It 0x00080
-use this port for remote kernel debugging
 .It 0x0 Ns Em ?? Ns 00
 minor number of master port
 .It 0x20000
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index f4db631af0e0..840d1530f5ae 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -31,14 +31,13 @@
 .\" $FreeBSD$
 .\"
 .Dd September 4, 1999
-.Dt SIS 4
+.Dt SIS 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm sis
 .Nd
 Silicon Integrated Systems fast ethernet device driver
 .Sh SYNOPSIS
-.Cd "controller miibus0"
 .Cd "device sis0"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index b52a2999178f..5fc826e6f34c 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 3, 1999
-.Dt SK 4
+.Dt SK 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm sk
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index f2e62ff4bd0b..640964527990 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 9, 1999
-.Dt SPLASH 4
+.Dt SPLASH 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm splash
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 2e2d011e995f..efe58c69a8cc 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -31,14 +31,13 @@
 .\" $FreeBSD$
 .\"
 .Dd August 21, 1999
-.Dt STE 4
+.Dt STE 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ste
 .Nd
 Sundance Technologies ST201 fast ethernet device driver
 .Sh SYNOPSIS
-.Cd "controller miibus0"
 .Cd "device ste0"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 52dfa50e8673..4a68898022f2 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -26,8 +26,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 1999
-.Dt SYSCONS 4
+.Dd February 9, 1999
+.Dt SYSCONS 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm syscons ,
@@ -35,26 +35,19 @@
 .Nd
 the console driver
 .Sh SYNOPSIS
-.Cd "options MAXCONS=N"
-.Cd "options SC_ALT_MOUSE_IMAGE"
-.Cd "options SC_DISABLE_DDBKEY"
-.Cd "options SC_DISABLE_REBOOT"
-.Cd "options SC_HISTORY_SIZE=N"
-.Cd "options SC_MOUSE_CHAR=C"
-.Cd "options SC_NO_CUTPASTE"
-.Cd "options SC_NO_FONT_LOADING"
-.Cd "options SC_NO_HISTORY"
-.Cd "options SC_NO_PALETTE_LOADING"
-.Cd "options SC_NO_SYSMOUSE"
-.Cd "options SC_PIXEL_MODE"
-.Cd "options SC_TWOBUTTON_MOUSE
-.Cd "options SC_NORM_ATTR"=\&"_attribute_\&"
-.Cd "options SC_NORM_REV_ATTR"=\&"_attribute_\&"
-.Cd "options SC_KERNEL_CONS_ATTR"=\&"_attribute_\&"
-.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?"
+.Cd "options" \&"MAXCONS=N\&"
+.\".Cd "options" \&"SC_ALT_MOUSE_IMAGE\&"
+.Cd "options" \&"SC_DISABLE_REBOOT\&"
+.Cd "options" \&"SC_HISTORY_SIZE=N\&"
+.Cd "options" \&"SC_MOUSE_CHAR=C\&"
+.\".Cd "options" \&"SC_NO_CUTPASTE\&"
+.\".Cd "options" \&"SC_NO_FONT_LOADING\&"
+.\".Cd "options" \&"SC_NO_HISTORY\&"
+.\".Cd "options" \&"SC_NO_SYSMOUSE\&"
+.\".Cd "options" \&"SC_PIXEL_MODE\&"
+.Cd "options" \&"STD8X16FONT\&"
+.Cd "makeoptions" \&"STD8X16FONT\&"=\&"_font_name_\&"
+.Cd "device sc0 at isa? tty"
 .Sh DESCRIPTION
 The
 .Nm
@@ -138,7 +131,7 @@ for the keymap file.
 You may want to set the
 .Ar keymap
 variable in 
-.Pa /etc/rc.conf.local
+.Pa /etc/rc.conf
 to the desired keymap file so that it will be automatically loaded
 when the system starts up.
 .Ss Software Font
@@ -163,13 +156,13 @@ You may set
 and
 .Ar font8x16
 variables in
-.Pa /etc/rc.conf.local
+.Pa /etc/rc.conf
 to the desired font files so that they will be automatically loaded
 when the system starts up.
 .Pp
-Optionally you can make a particular font file as the default font.
+Optionally you can make a particular font file as the default 8x16 font.
 See the
-.Em SC_DFLT_FONT
+.Em STD8X16FONT
 option below.
 .Ss Screen Map
 If your video card does not support software font, you may still be able
@@ -194,15 +187,6 @@ the selected region.
 The selected text is placed in the copy buffer and can be pasted
 at the cursor position by your pressing the button 2 (usually the
 middle button) as many times as you like.
-.Pp
-If your mouse has only two buttons, you may want to use the
-.Em SC_TWOBUTTON_MOUSE
-option below to make the right button to paste the text.
-Alternatively you can make the mouse daemon
-to emulate the middle button.
-See the man page for
-.Xr moused 8
-for more details.
 .Ss Back Scrolling
 The
 .Nm
@@ -249,36 +233,26 @@ driver.
 This option sets the number of virtual terminals to
 .Fa N .
 The default value is 16.
-.It Em SC_ALT_MOUSE_IMAGE
-This option selects the alternative way of displaying the mouse cursor
-in the virtual terminal.
-It may be vastly costly for some video cards to draw the arrow-shaped
-cursor and you may want to try this option.
-However, the appearance of the alternative mouse cursor may not be
-very appealing.
-.It Em SC_DISABLE_DDBKEY
-This option disables the ``debug'' key (by default, it is 
-.Em Alt-Esc ,
-or
-.Em Ctl-PrintScreen
-).
-It will prevent the user from
-entering the kernel debugger DDB by pressing the key combination.  
-DDB will still be invoked when the kernel panics or hits a break point 
-if it is included in the kernel.
+.\".It Em SC_ALT_MOUSE_IMAGE
+.\"This option selects the alternative way of displaying the mouse cursor
+.\"in the virtual terminal.
+.\"It may be vastly costly for some video cards to draw the arrow-shaped
+.\"cursor and you may want to try this option.
+.\"However, the appearance of the alternative mouse cursor may not be
+.\"very appealing.
 .It Em SC_DISABLE_REBOOT
 This option disables the ``reboot'' key (by default, it is 
-.Em Ctl-Alt-Del
-), so that the casual user may not accidentally reboot the system.
+.Em Ctl-Alt-Del ),
+so that the casual user may not accidentally reboot the system.
 .It Em SC_HISTORY_SIZE=N
 Sets the size of back scroll buffer to 
 .Fa N
 lines.
 The default value is 100.
 .It Em SC_MOUSE_CHAR=C
-Unless the
-.Em SC_ALT_MOUSE_IMAGE
-option above is specified, the
+.\"Unless the
+.\".Em SC_ALT_MOUSE_IMAGE
+.\"option above is specified, the
 The
 .Nm
 driver reserves four consecutive character codes in order to display the 
@@ -288,34 +262,9 @@ This option specifies the first character code to
 to be used for this purpose.
 The default value is 0xd0.
 A good candidate is 0x03.
-.It Em SC_PIXEL_MODE
-Adds support for pixel (raster) mode console.
-This mode is useful on some laptop computers, but less so on
-most other systems, and it adds substantial amount of code to syscons.
-If the this option is NOT defined, you can reduce the kernel size a lot.
-See the
-.Em VESA800X600
-flag below.
-.It Em SC_TWOBUTTON_MOUSE
-If you have a two button mouse, you may want to add this option 
-to use the right button of the mouse to paste text.
-See
-.Sx Mouse Support and Copy-and-Paste
-above.
-.It Em SC_NORM_ATTR=\&"_attribute_\&"
-.It Em SC_NORM_REV_ATTR=\&"_attribute_\&"
-.It Em SC_KERNEL_CONS_ATTR=\&"_attribute_\&"
-.It Em SC_KERNEL_CONS_REV_ATTR=\&"_attribute_\&"
-These options will set the default colors.
-Available colors are defined in
-.Pa /usr/include/machine/pc/display.h .
-See
-.Sx EXAMPLE
-below.
-.It Em SC_DFLT_FONT
-This option will specify the default font.
-Available fonts are: iso, iso2, koi8-r, cp437, cp850, cp865 and cp866.
-16-line, 14-line and 8-line font data will be compiled in.  
+.\".It Em SC_PIXEL_MODE
+.It Em STD8X16FONT
+This option will specify the default 8x16 font.
 Without this option, the
 .Nm
 driver will use whatever font already loaded in the video card,
@@ -324,33 +273,32 @@ See
 .Sx EXAMPLE
 below.
 .El
-.Pp
-The following options will remove some features from the
-.Nm
-driver and save kernel memory.
-.Bl -tag -width MOUSE
-.It Em SC_NO_CUTPASTE
-This option disables ``copy and paste'' operation in virtual
-terminals.
-.It Em SC_NO_FONT_LOADING
-The
-.Nm
-driver can load software font on some video cards.
-This option removes this feature.
-.It Em SC_NO_HISTORY
-This option disables back-scrolling in virtual terminals.
-.\".It Em SC_NO_PALETTE_LOADING
-.It Em SC_NO_SYSMOUSE
-This option removes mouse support in the
-.Nm
-driver.
-The mouse daemon
-.Xr moused 8
-will fail if this option is defined.
-This option implies the
-.Em SC_NO_CUTPASTE
-option too.
-.El
+.\".Pp
+.\"The following options will remove some features from the
+.\".Nm
+.\"driver and save kernel memory.
+.\".Bl -tag -width MOUSE
+.\".It Em SC_NO_CUTPASTE
+.\"This option disables ``copy and paste'' operation in virtual
+.\"terminals.
+.\".It Em SC_NO_FONT_LOADING
+.\"The
+.\".Nm
+.\"driver can load software font on some video cards.
+.\"This option removes this feature.
+.\".It Em SC_NO_HISTORY
+.\"This option disables back-scrolling in virtual terminals.
+.\".It Em SC_NO_SYSMOUSE
+.\"This option removes mouse support in the
+.\".Nm
+.\"driver.
+.\"The mouse daemon
+.\".Xr moused 8
+.\"will fail if this option is defined.
+.\"This option implies the
+.\".Em SC_NO_CUTPASTE
+.\"option too.
+.\".El
 .Ss Driver Flags
 The following driver flags can be used to control the
 .Nm
@@ -361,36 +309,32 @@ or else in the User Configuration Menu at boot
 time
 .Pq see Xr boot 8 .
 .Bl -tag -width bit_0
-.\".It bit 0 (VISUAL_BELL)
-.\"Uses the ``visual'' bell.
-.\"The screen will blink instead of generating audible sound.
-.\".It bit 1,2 (CURSOR_TYPE)
-.\"This option specifies the cursor appearance.
-.\"Possible values are:
-.\".Bl -tag -width TYPE -compact
-.\".It Em 0
-.\"normal block cursor
-.\".It Em 2
-.\"blinking block cursor
-.\".It Em 4
-.\"underline cursor
-.\".It Em 6
-.\"blinking underline (aka destructive) cursor
-.\".El
-.\".It bit 6 (QUIET_BELL)
-.\"This option suppresses the bell, whether audible or visual, 
-.\"if it is rung in a background virtual terminal.
+.It bit 0 (VISUAL_BELL)
+Uses the ``visual'' bell.
+The screen will blink instead of generating audible sound.
+.It bit 1,2 (CURSOR_TYPE)
+This option specifies the cursor appearance.
+Possible values are:
+.Bl -tag -width TYPE -compact
+.It Em 0
+normal block cursor
+.It Em 2
+blinking block cursor
+.It Em 4
+underline cursor
+.It Em 6
+blinking underline (aka destructive) cursor
+.El
+.It bit 6 (QUIET_BELL)
+This option suppresses the bell, whether audible or visual, 
+if it is rung in a background virtual terminal.
 .It bit 7 (VESA800X600)
 This option puts the video card in the VESA 800x600 dots, 16 color
 mode.
 It may be useful for laptop computers for which the 800x600 mode
 is otherwise unsupported by the X server.
-Note that in order for this flag to work, the kernel must be 
-compiled with the
-.Em SC_PIXEL_MODE
-option explained above.
-.\"Note also that the ``copy-and-paste'' function is not currently supported 
-.\"in this mode and the mouse pointer will not be displayed.
+Note that the ``copy-and-paste'' function is not currently supported in 
+this mode and the mouse pointer will not be displayed.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/xxxxyyyyzzz -compact
@@ -414,10 +358,10 @@ 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 atkbdc0 at isa? port IO_KBD tty
+device atkbd0 at isa? tty irq 1
 device vga0 at isa? conflicts
-device sc0 at isa?
+device sc0 at isa? tty
 
 pseudo-device splash
 .Ed
@@ -430,33 +374,13 @@ Note that the keyboard controller driver
 is required by the keyboard driver
 .Nm atkbd .
 .Pp
-The following lines will set the default colors. 
-The normal text will be green on black background. 
-The reversed text will be yellow on green background.
-Note that you cannot put any white space inside the quoted string,
-because of the current implementation of
-.Xr config 8 .
-.Pp
-.Dl "options SC_NORM_ATTR"=\&"(FG_GREEN|BG_BLACK)\&"
-.Dl "options SC_NORM_REV_ATTR"=\&"(FG_YELLOW|BG_GREEN)\&"
-.Pp
-The following lines will set the default colors of the kernel message. 
-The kernel message will be printed bright red on black background.
-The reversed message will be black on red background.
-.Pp
-.Dl "options SC_KERNEL_CONS_ATTR"=\&"(FG_LIGHTRED|BG_BLACK)\&"
-.Dl "options SC_KERNEL_CONS_REV_ATTR"=\&"(FG_BLACK|BG_RED)\&"
-.Pp
-The following example adds the font files
-.Pa cp850-8x16.fnt ,
-.Pa cp850-8x14.font 
-and
-.Pa cp850-8x8.font
-to the kernel.
+The following example adds the font file
+.Pa /usr/share/syscons/fonts/cp850-8x16.fnt
+to the kernel as the default 8x16 font.
 .Pp
-.Dl "options SC_DFLT_FONT"
-.Dl "makeoptions SC_DFLT_FONT"=\&"cp850\&"
-.Dl "device sc0 at isa?
+.Dl "options" \&"STD8X16FONT\&"
+.Dl "makeoptions" \&"STD8X16FONT\&"=\&"cp850\&"
+.Dl "device sc0 at isa? tty"
 .Pp
 .\".Sh DIAGNOSTICS
 .\".Sh CAVEATS
@@ -471,7 +395,6 @@ This manual page is incomplete and urgently needs revision.
 .Xr keyboard 4 ,
 .Xr screen 4 ,
 .Xr splash 4 ,
-.Xr ukbd 4 ,
 .Xr vga 4 ,
 .Xr keymap 5 ,
 .Xr rc.conf 5 ,
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index 7817eaa6faa7..dc6e4a4f062a 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -28,7 +28,7 @@
 .\" $FreeBSD$
 .\"
 .Dd December 3, 1997
-.Dt SYSMOUSE 4
+.Dt SYSMOUSE 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm sysmouse
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 3d12ae697aae..b74249001114 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd March 4, 1999
-.Dt TI 4
+.Dt TI 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ti
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 25465365da5c..3591a6dab733 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd May 1, 1998
-.Dt TL 4
+.Dt TL 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm tl
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 56a80207641b..85873db06c76 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -29,9 +29,10 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
-.Dt UKBD 4
+.Dt UKBD 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ukbd
@@ -103,7 +104,7 @@ kbdcontrol -k /dev/kbd0 < /dev/ttyv0 > /dev/null
 /dev/kbd0) or otherwise tell the console driver to periodically look for a
 keyboard by setting a flag in the kernel configuration file:
 .Bd -literal -offset indent
-device sc0 at isa? flags 0x100
+device sc0 at isa? tty flags 0x100
 .Ed
 .Pp
 With the above flag, the console driver will try to detect any
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 7a254e8b130f..4986d0de3d0c 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -29,9 +29,10 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
-.Dt UMS 4
+.Dt UMS 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm ums
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 596d7adfaa8f..0bda07c22bd5 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 21, 1999
-.Dt USB 4
+.Dt USB 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm usb
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 53543d11ca18..6e5dc414f8ea 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -26,21 +26,21 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 1999
-.Dt VGA 4
+.Dd February 9, 1999
+.Dt VGA 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm vga
 .Nd
 generic video card interface
 .Sh SYNOPSIS
-.Cd "options VESA"
-.Cd "options VESA_DEBUG=N"
-.Cd "options VGA_ALT_SEQACCESS"
-.Cd "options VGA_NO_FONT_LOADING"
-.Cd "options VGA_NO_MODE_CHANGE"
-.Cd "options VGA_SLOW_IOACCESS"
-.Cd "options VGA_WIDTH90"
+.Cd "options" \&"VESA\&"
+.Cd "options" \&"VESA_DEBUG=N\&"
+.Cd "options" \&"VGA_ALT_SEQACCESS\&"
+.Cd "options" \&"VGA_NO_FONT_LOADING\&"
+.Cd "options" \&"VGA_NO_MODE_CHANGE\&"
+.Cd "options" \&"VGA_SLOW_IOACCESS\&"
+.Cd "options" \&"VM86\&"
 .Cd "device vga0 at isa? port ? conflicts"
 .Sh DESCRIPTION
 The
@@ -64,14 +64,19 @@ addition, the driver can utilize VESA BIOS extensions if the video card
 supports them. VESA support can either be statically included in the kernel
 or can be loaded as a separate module.
 .Pp
-In order to statically link the VESA support to the kernel, the
+In order to statically link the support to the kernel, the
 .Em VESA
-option (see below) must be defined in the kernel configuration file.
+option (see below) and the
+.Em VM86
+option must be defined in the kernel configuration file.
 .Pp
 The
 .Nm vesa
 module can be dynamically loaded into the kernel using 
 .Xr kldload 8 .
+This requires the
+.Em VM86
+option to be defined in the kernel configuration file.
 .Sh DRIVER CONFIGURATION
 .Ss Kernel Configuration Options
 The following kernel configuration options 
@@ -89,10 +94,6 @@ However, it may cause flicker on some systems.
 Older VGA cards may require this option for proper operation.
 It makes the driver perform byte-wide I/O to VGA registers and
 slow down a little.
-.It Em VGA_WIDTH90
-This option enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.  
-These modes are not always supported by the video card and the display.
-It is highly likely that LCD display cannot work with these modes.
 .El
 .Pp
 The following options add optional features to the driver.
@@ -102,6 +103,9 @@ Add VESA BIOS support to the driver.
 If the VGA card has the VESA BIOS extension 1.2 or later, 
 this option will utilize the VESA BIOS service to switch to high
 resolution modes.
+This option requires the 
+.Em VM86
+option.
 .It Em VESA_DEBUG=N
 Set the VESA support debug level to
 .Fa N .
@@ -129,13 +133,18 @@ Your kernel configuration should normally have:
 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 "options" \&"VM86\&"
+.Dl "options" \&"VESA\&"
 .Dl "device vga0 at isa? port ? conflicts"
 .Pp
 If you do not want VESA support included in the kernel, but
-want to use occasionally, do not add the
-.Em VESA
-option.  And load the
+want to use occasionally, add the following lines to the kernel configuration
+file:
+.Pp
+.Dl "options" \&"VM86\&"
+.Dl "device vga0 at isa? port ? conflicts"
+.Pp
+Then load the
 .Nm vesa
 module as desired:
 .Pp
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 544ddd09a3da..8100bfeccd36 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 22, 1998
-.Dt VR 4
+.Dt VR 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm vr
@@ -45,16 +45,15 @@ The
 driver provides support for PCI ethernet adapters and embedded
 controllers based on the VIA Technologies VT3043 Rhine I and
 VT86C100A Rhine II fast ethernet controller chips. This includes
-the D-Link DFE530-TX, the Hawking Technologies PN102TX, the
-AOpen/Acer ALN-320, and various other commodity fast ethernet
+the D-Link DFE530-TX and various other commodity fast ethernet
 cards.
 .Pp
-The VIA Rhine chips use bus master DMA and have a descriptor layout
-designed to resemble that of the DEC 21x4x "tulip" chips. The register
-layout is different however and the receive filter in the Rhine chips
-is much simpler and is programmed through registers rather than by
-downloading a special setup frame through the transmit DMA engine.
-Transmit and receive DMA buffers must be longword
+The VIA Rhine chips use bus master DMA and have a software interface
+designed to resemble that of the DEC 21x4x "tulip" chips. The major
+differences are that the receive filter in the Rhine chips is
+much simpler and is programmed through registers rather than by
+downloading a special setup frame through the transmit DMA engine,
+and that transmit and receive DMA buffers must be longword
 aligned. The Rhine chips are meant to be interfaced with external
 physical layer devices via an MII bus. They support both
 10 and 100Mbps speeds in either full or half duplex.
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 016cb4aece31..df4de1ce03d3 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 4, 1998
-.Dt WB 4
+.Dt WB 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm wb
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 0379cd5eea6e..62a76c709e06 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd August 16, 1998
-.Dt XL 4
+.Dt XL 4 i386
 .Os FreeBSD
 .Sh NAME
 .Nm xl