A potpourri of Xr and layout fixes.

ok deraadt@

22 files changed, 83 insertions, 90 deletions

diff --git a/share/man/man4/hilkbd.4 b/share/man/man4/hilkbd.4
index 705aa975d1b..f87e9df5a16 100644
--- a/share/man/man4/hilkbd.4
+++ b/share/man/man4/hilkbd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hilkbd.4,v 1.5 2003/05/05 13:51:57 jmc Exp $
+.\"	$OpenBSD: hilkbd.4,v 1.6 2004/03/22 20:31:35 miod Exp $
 .\"
 .\" Copyright (c) 2003 Miodrag Vallat.
 .\" All rights reserved.
@@ -90,5 +90,5 @@ to the kernel configuration file.
 .Xr wskbd 4 ,
 .Xr wsconsctl 8
 .Sh BUGS
-The list of built-in mappings doesn't follow any logic.
-It grew as people submitted what they needed.
+The list of built-in mappings is incomplete and has grown as people submitted
+information about their particular layout.
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index 4a0c0ac0b33..407510bec9a 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbc.4,v 1.11 2004/02/07 20:08:53 miod Exp $
+.\" $OpenBSD: pckbc.4,v 1.12 2004/03/22 20:31:35 miod Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -56,6 +56,7 @@ slot for mice (the latter might be missing in older keyboard controllers).
 .\" useful in normal operation.
 .Sh SEE ALSO
 .Xr ebus 4 ,
+.Xr intro 4 ,
 .Xr isa 4 ,
 .Xr pckbd 4 ,
 .Xr pms 4 ,
diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4
index ee04d820cec..a63b5491bac 100644
--- a/share/man/man4/pckbd.4
+++ b/share/man/man4/pckbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbd.4,v 1.22 2004/03/16 07:53:25 miod Exp $
+.\" $OpenBSD: pckbd.4,v 1.23 2004/03/22 20:31:35 miod Exp $
 .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $
 .\"
 .\" Copyright (c) 1999
@@ -212,6 +212,7 @@ To set it at kernel build time, add
 .Em option PCKBD_LAYOUT="(KB_DE|KB_NODEAD|KB_METAESC)"
 to the kernel configuration file.
 .Sh SEE ALSO
+.Xr intro 4 ,
 .Xr isa 4 ,
 .Xr pckbc 4 ,
 .Xr wskbd 4 ,
diff --git a/share/man/man4/pcppi.4 b/share/man/man4/pcppi.4
index 6758c01a713..6231ef96b16 100644
--- a/share/man/man4/pcppi.4
+++ b/share/man/man4/pcppi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pcppi.4,v 1.6 2004/02/07 20:08:53 miod Exp $
+.\" $OpenBSD: pcppi.4,v 1.7 2004/03/22 20:31:35 miod Exp $
 .\" $NetBSD: pcppi.4,v 1.5 2001/10/02 20:37:00 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -59,9 +59,13 @@ The
 and
 .Xr midi 4
 devices use this to synthesize sounds.
-The isabeep and sysbeep devices are helpers which the
+The
+.Nm isabeep
+and
+.Nm sysbeep
+devices are helpers used by the
 .Xr pckbd 4
-driver uses as a substitute for a
+driver as a substitute for a
 .Dq keyboard beep ,
 because the PC keyboard hardware doesn't provide this.
 .Sh SEE ALSO
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 1dde3d54f59..30d84bc0065 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rl.4,v 1.19 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: rl.4,v 1.20 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -98,7 +98,7 @@ PHY chip.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 This is only supported if the PHY chip attached to the Realtek controller
@@ -130,7 +130,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/sbus.4 b/share/man/man4/sbus.4
index 68bd808a0b8..75f205eccab 100644
--- a/share/man/man4/sbus.4
+++ b/share/man/man4/sbus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sbus.4,v 1.24 2004/02/29 21:44:04 miod Exp $
+.\"	$OpenBSD: sbus.4,v 1.25 2004/03/22 20:31:36 miod Exp $
 .\"	$NetBSD: sbus.4,v 1.5 2002/01/21 17:54:10 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@ includes the following
 .Nm
 drivers, sorted by device type and driver name:
 .Ss Audio interfaces
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr audioamd 4
 .Tn AMD
 7990 codecs.
@@ -74,7 +74,7 @@ drivers, sorted by device type and driver name:
 CS4231A codecs.
 .El
 .Ss SCSI interfaces
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr esp 4
 NCR53c94 and compatible
 .Tn SCSI
@@ -85,7 +85,7 @@ Qlogic
 interfaces.
 .El
 .Ss Network interfaces
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr be 4
 .Dq Big Mac
 .Tn Ethernet
@@ -109,14 +109,14 @@ Quad Ethernet Controller
 board.
 .El
 .Ss Bridges
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr stp 4
 .Nm sbus
 .Xr pcmcia 4
 bridge.
 .El
 .Ss Graphics devices
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr agten 4
 Fujitsu AG-10e accelerated 24-bit color frame buffer.
 .It Xr bwtwo 4
@@ -149,7 +149,7 @@ Accelerated 24-bit color frame buffer.
 Accelerated 24-bit color frame buffer.
 .El
 .Ss Serial and parallel interfaces
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr apio 4
 Aurora Technologies pio1 parallel port card.
 .It Xr asio 4
@@ -162,7 +162,7 @@ Magma LC series Serial/Parallel Interface cards.
 Sun Serial/Parallel Interface card.
 .El
 .Ss Miscellaneous devices
-.Bl -tag -width 12n -offset ind -compact
+.Bl -tag -width 13n -offset ind -compact
 .It Xr auxio 4
 Miscellaneous I/O controls.
 .It Xr presto 4
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 4eeb6e08df6..5daf1129216 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.4,v 1.16 2004/03/12 00:04:51 miod Exp $
+.\"	$OpenBSD: scsi.4,v 1.17 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
@@ -32,33 +32,7 @@
 .Nm scsi
 .Nd scsi system
 .Sh SYNOPSIS
-.Cd "scsibus at aac?"
-.Cd "scsibus at adv?"
-.Cd "scsibus at adw?"
-.Cd "scsibus at aha?"
-.Cd "scsibus at ahb?"
-.Cd "scsibus at ahc?"
-.Cd "scsibus at aic?"
-.Cd "scsibus at ami?"
-.Cd "scsibus at atapiscsi?"
-.Cd "scsibus at bha?"
-.Cd "scsibus at cac?"
-.Cd "scsibus at dpt?"
-.Cd "scsibus at gdt?"
-.Cd "scsibus at iha?"
-.Cd "scsibus at ioprbs?"
-.Cd "scsibus at iopsp?"
-.Cd "scsibus at isp?"
-.Cd "scsibus at mpt?"
-.Cd "scsibus at ncr?"
-.Cd "scsibus at oosiop?"
-.Cd "scsibus at osiop?"
-.Cd "scsibus at pcscp?"
-.Cd "scsibus at siop?"
-.Cd "scsibus at trm?"
-.Cd "scsibus at twe?"
-.Cd "scsibus at umass?"
-.Cd "scsibus at usscanner?"
+.Cd "scsibus at ..."
 .Pp
 .Cd "cd* at scsibus? target ? lun ?"
 .Cd "ch* at scsibus? target ? lun ?"
@@ -70,7 +44,7 @@
 .Cd "ses* at scsibus? target ? lun ?"
 .Sh DESCRIPTION
 The
-.Em scsi
+.Em SCSI
 system provides a uniform and modular system for the implementation
 of drivers to control various scsi devices, and to utilize different
 scsi host adapters through host adapter drivers.
@@ -209,33 +183,44 @@ shows more detailed information including DMA scatter-gather logs.
 .Xr ahc 4 ,
 .Xr aic 4 ,
 .Xr ami 4 ,
+.Xr asc 4 ,
 .Xr atapiscsi 4 ,
 .Xr bha 4 ,
 .Xr cac 4 ,
 .Xr cd 4 ,
 .Xr ch 4 ,
 .Xr dpt 4 ,
+.Xr esp 4 ,
 .Xr gdt 4 ,
 .Xr iha 4 ,
 .Xr intro 4 ,
 .Xr ioprbs 4 ,
 .Xr iopsp 4 ,
 .Xr isp 4 ,
+.\" .Xr mesh 4 ,
 .Xr mpt 4 ,
 .Xr ncr 4 ,
+.Xr ncrscsi 4 ,
 .Xr oosiop 4 ,
 .Xr osiop 4 ,
 .Xr pcscp 4 ,
 .Xr sd 4 ,
+.Xr sea 4 ,
 .Xr ses 4 ,
+.Xr si 4 ,
 .Xr siop 4 ,
 .Xr ss 4 ,
+.Xr ssh 4 ,
 .Xr st 4 ,
+.Xr sw 4 ,
 .Xr trm 4 ,
 .Xr twe 4 ,
 .Xr uk 4 ,
 .Xr umass 4 ,
 .Xr usscanner 4 ,
+.Xr vs 4 ,
+.Xr wds 4 ,
+.Xr wdsc 4 ,
 .Xr scsi 8
 .Sh HISTORY
 This
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index d3732cd199e..0ac40de96db 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sf.4,v 1.13 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: sf.4,v 1.14 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -78,7 +78,7 @@ driver.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 The user can manually override
@@ -108,7 +108,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index e28883c5fcc..e8bb1f176af 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sis.4,v 1.17 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: sis.4,v 1.18 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -65,7 +65,7 @@ by the same driver.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 The user can manually override
@@ -95,7 +95,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 8c16858d84f..25a36b7b467 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ste.4,v 1.14 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: ste.4,v 1.15 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -60,7 +60,7 @@ using an MII transceiver.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 The user can manually override
@@ -90,7 +90,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/systrace.4 b/share/man/man4/systrace.4
index 3600479b2b2..feac52ca9af 100644
--- a/share/man/man4/systrace.4
+++ b/share/man/man4/systrace.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systrace.4,v 1.9 2004/03/21 19:47:59 miod Exp $
+.\"	$OpenBSD: systrace.4,v 1.10 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 2002, 2003 CubeSoft Communications, Inc.
 .\" All rights reserved.
@@ -102,7 +102,7 @@ struct str_msg_child {
 supports the following
 .Xr ioctl 2
 commands:
-.Bl -tag -width "xxxxxx"
+.Bl -tag -width STRIOCXXXXXXXX
 .It Dv SYSTR_CLONE Fa "int"
 Return a
 .Nm
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 2b67e630b5e..dc206f9f0e5 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ti.4,v 1.20 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: ti.4,v 1.21 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -105,7 +105,7 @@ such as file transfers and data streaming.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 The user can manually override
@@ -142,7 +142,7 @@ Set 1000Mbps (Gigabit Ethernet) on copper operation.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation
 .It half-duplex
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 7d443af4d20..a38b6c53654 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tl.4,v 1.13 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: tl.4,v 1.14 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: tl.4,v 1.13 2003/11/09 16:06:07 jmc Exp $
+.\"	$Id: tl.4,v 1.14 2004/03/22 20:31:36 miod Exp $
 .\"
 .Dd May 1, 1998
 .Dt TL 4
@@ -65,7 +65,7 @@ The ThunderLAN's built-in PHY and the DP83840A also support autonegotiation.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 Note that this option is only available on those PHYs that support
@@ -76,14 +76,14 @@ disabled using the following media options.
 Set 10Mbps operation.
 .It 100baseTX
 Set 100Mbps (Fast Ethernet) operation.
-.It 10base5/AUI
+.It 10base5
 Enable AUI/BNC interface (useful only with the built-in PHY).
 .El
 .Pp
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index 63d5e009c51..d2e8e187d0c 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: tx.4,v 1.12 2003/06/06 10:29:41 jmc Exp $
+.\"     $OpenBSD: tx.4,v 1.13 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -68,7 +68,7 @@ supports several media types, which are selected via the
 .Xr ifconfig 8
 command.
 The supported media types are:
-.Bl -tag -width xxxxxxxxxxxxxx -offset indent
+.Bl -tag -width 6n -offset indent
 .It media autoselect
 Attempt to autoselect the media type (default)
 .It media 100baseFX mediaopt full-duplex
diff --git a/share/man/man4/txp.4 b/share/man/man4/txp.4
index e9a7005109b..9a29701acac 100644
--- a/share/man/man4/txp.4
+++ b/share/man/man4/txp.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: txp.4,v 1.11 2003/06/02 18:51:33 jason Exp $
+.\"     $OpenBSD: txp.4,v 1.12 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -103,7 +103,7 @@ supports several media types, which are selected via the
 .Xr ifconfig 8
 command.
 The supported media types are:
-.Bl -tag -width xxxxxxxxxxxxxx -offset indent
+.Bl -tag -width 6n -offset indent
 .It media autoselect
 Attempt to autoselect the media type (default)
 .It media 100baseTX mediaopt full-duplex
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index d8d6ba5c529..5e14c07fb02 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uk.4,v 1.13 2003/09/04 22:14:42 jmc Exp $
+.\"	$OpenBSD: uk.4,v 1.14 2004/03/22 20:31:36 miod Exp $
 .\"	$NetBSD: uk.4,v 1.3 1996/10/20 23:15:26 explorer Exp $
 .\"
 .\" Copyright (c) 1996
@@ -43,10 +43,6 @@ driver.
 .Pp
 A SCSI adapter must also be separately configured into the system
 before this driver makes sense.
-.Sh KERNEL CONFIGURATION
-If a count is given that number of
-.Nm
-devices will be configured into the kernel.
 .Sh IOCTLS
 The
 .Nm
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 1336a9fe401..b24988efc4d 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vr.4,v 1.14 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: vr.4,v 1.15 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -62,7 +62,7 @@ They support both 10 and 100Mbps speeds in either full or half duplex.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 The user can manually override
@@ -92,7 +92,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 65cd189bbcf..669105c1217 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wb.4,v 1.12 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: wb.4,v 1.13 2004/03/22 20:31:36 miod Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -62,7 +62,7 @@ supports both 10 and 100Mbps speeds in either full or half duplex.
 The
 .Nm
 driver supports the following media types:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It autoselect
 Enable autoselection of the media type and options.
 This is only supported if the PHY chip attached to the Winbond controller
@@ -94,7 +94,7 @@ modes.
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.Bl -tag -width full-duplex
 .It full-duplex
 Force full duplex operation.
 .It half-duplex
diff --git a/share/man/man4/wdc.4 b/share/man/man4/wdc.4
index 73a53557eb7..6f6ecb5b77c 100644
--- a/share/man/man4/wdc.4
+++ b/share/man/man4/wdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wdc.4,v 1.12 2003/11/08 16:55:35 miod Exp $
+.\"	$OpenBSD: wdc.4,v 1.13 2004/03/22 20:31:36 miod Exp $
 .\"	$NetBSD: wdc.4,v 1.4 1999/05/19 14:44:02 bouyer Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -66,7 +66,9 @@ PCI IDE controllers in legacy mode are also supported, but the
 .Xr pciide 4
 driver may provide more functionality.
 .Pp
-For the ISA front-end, setting
+For the
+.Xr isa 4
+front-end, setting
 .Cm flags
 to 0x01 enables 32-bit I/O negotiation.
 This is known to cause problems with some motherboards.
@@ -75,6 +77,7 @@ This is known to cause problems with some motherboards.
 .Xr intro 4 ,
 .Xr isa 4 ,
 .Xr isapnp 4 ,
+.Xr macobio 4 ,
 .Xr pciide 4 ,
 .Xr pcmcia 4 ,
 .Xr scsi 4 ,
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index c3ad6797ec4..4b051a1cac7 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wskbd.4,v 1.12 2003/07/09 13:26:20 jmc Exp $
+.\" $OpenBSD: wskbd.4,v 1.13 2004/03/22 20:31:36 miod Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
 .\"
 .\" Copyright (c) 1999
@@ -33,6 +33,7 @@
 .Nd generic keyboard support in wscons
 .Sh SYNOPSIS
 .Cd "wskbd* at pckbd? console ? mux 1"
+.Cd "wskbd* at gsckbd? console ? mux 1" Pq hppa
 (PS/2 keyboard)
 .Cd "wskbd* at ukbd? console ? mux 1"
 (USB keyboard)
@@ -142,6 +143,7 @@ driver supports it.
 .Sh SEE ALSO
 .Xr akbd 4 ,
 .Xr comkbd 4 ,
+.Xr gsckbd 4 ,
 .Xr hilkbd 4 ,
 .Xr intro 4 ,
 .Xr pckbd 4 ,
diff --git a/share/man/man4/wsmux.4 b/share/man/man4/wsmux.4
index c2a93cacba8..96a104b1b4c 100644
--- a/share/man/man4/wsmux.4
+++ b/share/man/man4/wsmux.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsmux.4,v 1.11 2004/03/21 19:47:59 miod Exp $
+.\" $OpenBSD: wsmux.4,v 1.12 2004/03/22 20:31:37 miod Exp $
 .\" $NetBSD: wsmux.4,v 1.2 1999/11/03 22:01:40 castor Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -78,13 +78,13 @@ This is used by the
 daemon to take data from a mouse connected to a serial port and
 make it appear on the standard mouse mux.
 .Sh FILES
-.Bl -item
+.Bl -item -compact
 .It
 .Pa /dev/wsmouse
 .It
 .Pa /dev/wskbd
 .It
-.Pa /usr/include/dev/wscons/wsconsio.h .
+.Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
@@ -94,5 +94,4 @@ make it appear on the standard mouse mux.
 .Xr wsmouse 4 ,
 .Xr wsconscfg 8 ,
 .Xr wsconsctl 8 ,
-.Xr wsfontload 8 ,
 .Xr wsmoused 8
diff --git a/share/man/man4/xf86.4 b/share/man/man4/xf86.4
index dcdffcf6cf0..3f5ba61c914 100644
--- a/share/man/man4/xf86.4
+++ b/share/man/man4/xf86.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xf86.4,v 1.7 2004/02/07 20:08:53 miod Exp $
+.\"	$OpenBSD: xf86.4,v 1.8 2004/03/22 20:31:37 miod Exp $
 .\"
 .\" Copyright (c) 1998 Matthieu Herrb
 .\" All rights reserved.
@@ -36,6 +36,8 @@
 .Sh DESCRIPTION
 On
 .Va alpha ,
+.Va amd64 ,
+.Va cats ,
 .Va i386 ,
 .Va macppc ,
 .Va pegasos