- section reorder

- some macro fixes
- kill whitespace at EOL

152 files changed, 846 insertions, 848 deletions

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 15ad46b1d61..b2c44fde43d 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: aac.4,v 1.10 2003/02/17 13:39:37 jmc Exp $
-.\" 
+.\"	$OpenBSD: aac.4,v 1.11 2003/06/06 10:29:41 jmc Exp $
+.\"
 .\" Copyright (c) 2000 Michael Smith
 .\" Copyright (c) 2000 BSDi
 .\" Copyright (c) 2000 Niklas Hallqvist
@@ -59,6 +59,11 @@ This driver makes drives and/or RAID sets appear as
 .Xr intro 4 ,
 .Xr scsi 4 ,
 .Xr sd 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 2.9 .
 .Sh AUTHORS
 The
 .Nm
@@ -68,11 +73,6 @@ inspired by the
 .Fx
 driver by
 .An Mike Smith Aq msmith@freebsd.org .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 2.9 .
 .Sh BUGS
 The card provides a mechanism to do online RAID set management,
 unfortunately the protocol is not public.
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 4e7d806ef49..2545c77a3e5 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ahc.4,v 1.25 2003/05/05 09:51:30 miod Exp $
+.\"	$OpenBSD: ahc.4,v 1.26 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ahc.4,v 1.1.2.1 1996/08/25 17:22:14 thorpej Exp $
 .\"
 .\" Copyright (c) 1995, 1996
@@ -49,51 +49,51 @@ For SCSI buses:
 This driver provides access to the
 .Tn SCSI
 bus(es) connected to Adaptec
-.Tn AIC7770,
-.Tn AIC7850,
-.Tn AIC7860,
-.Tn AIC7870,
-.Tn AIC7880,
-.Tn AIC7890,
-.Tn AIC7891,
-.Tn AIC7892
-.Tn AIC7895,
-.Tn AIC7896,
-.Tn AIC7892,
-.Tn AIC7897,
+.Tn AIC7770 ,
+.Tn AIC7850 ,
+.Tn AIC7860 ,
+.Tn AIC7870 ,
+.Tn AIC7880 ,
+.Tn AIC7890 ,
+.Tn AIC7891 ,
+.Tn AIC7892 ,
+.Tn AIC7895 ,
+.Tn AIC7896 ,
+.Tn AIC7892 ,
+.Tn AIC7897 ,
 or
 .Tn AIC7899
 host adapter chips.
 These chips are found on many motherboards as well as the following
 Adaptec SCSI controller cards:
-.Tn 274X(W),
-.Tn 274X(T),
-.Tn 284X,
-.Tn 2920C,
-.Tn 2930U2,
-.Tn 2930CU,
-.Tn 2940,
-.Tn 2940U,
-.Tn 2940AU,
-.Tn 2940UW,
-.Tn 2940UW Dual,
-.Tn 2940U2W,
-.Tn 2940U2B,
-.Tn 2950U2W,
-.Tn 2950U2B,
-.Tn 19160,
-.Tn 29160,
-.Tn 3940,
-.Tn 3940U,
-.Tn 3940AU,
-.Tn 3940UW,
-.Tn 3940AUW,
-.Tn 3940U2W,
-.Tn 3950U2,
-.Tn 3960,
-.Tn 3960D,
+.Tn 274X(W) ,
+.Tn 274X(T) ,
+.Tn 284X ,
+.Tn 2920C ,
+.Tn 2930U2 ,
+.Tn 2930CU ,
+.Tn 2940 ,
+.Tn 2940U ,
+.Tn 2940AU ,
+.Tn 2940UW ,
+.Tn 2940UW Dual ,
+.Tn 2940U2W ,
+.Tn 2940U2B ,
+.Tn 2950U2W ,
+.Tn 2950U2B ,
+.Tn 19160 ,
+.Tn 29160 ,
+.Tn 3940 ,
+.Tn 3940U ,
+.Tn 3940AU ,
+.Tn 3940UW ,
+.Tn 3940AUW ,
+.Tn 3940U2W ,
+.Tn 3950U2 ,
+.Tn 3960 ,
+.Tn 3960D ,
 and
-.Tn 3985,
+.Tn 3985 .
 .Pp
 Driver features include support for twin and wide buses,
 fast, ultra, ultra2 and ultra160 synchronous transfers depending on
diff --git a/share/man/man4/ami.4 b/share/man/man4/ami.4
index a7d354c7565..015ce2730f0 100644
--- a/share/man/man4/ami.4
+++ b/share/man/man4/ami.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ami.4,v 1.12 2003/03/14 10:07:35 jmc Exp $
+.\"	$OpenBSD: ami.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Michael Shalayeff.  All rights reserved.
 .\" Public Domain.
@@ -36,16 +36,16 @@ All RAID configuration is done through the controllers' BIOSes.
 .Xr pci 4 ,
 .Xr scsi 4 ,
 .Xr sd 4
-.Sh AUTHORS
-The
-.Nm
-driver was written by
-.An Michael Shalayeff Aq mickey@openbsd.org .
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Ox 2.9 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Michael Shalayeff Aq mickey@openbsd.org .
 .Sh BUGS
 The
 .Tn IDE
diff --git a/share/man/man4/atalk.4 b/share/man/man4/atalk.4
index 6170279aa2d..a59772d7210 100644
--- a/share/man/man4/atalk.4
+++ b/share/man/man4/atalk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atalk.4,v 1.13 2003/03/14 10:07:35 jmc Exp $
+.\"	$OpenBSD: atalk.4,v 1.14 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" This file is derived from the atalk.4 man page in the Netatalk 1.4b2
 .\" distribution. That distribution is covered by the following copyright:
@@ -167,8 +167,8 @@ services are provided by user programs and daemons.
 .\" .BR atp (3N),
 .\" .BR asp (3N),
 .Xr bind 2 ,
-.Xr getsockname 2 ,
-.Xr atalkd 8
+.Xr getsockname 2
+.\" .Xr atalkd 8
 .Rs
 .%B Inside AppleTalk, second edition
 .%A Gursharan S. Sidhu
diff --git a/share/man/man4/atapiscsi.4 b/share/man/man4/atapiscsi.4
index a9be1af15dd..e8e96a315c1 100644
--- a/share/man/man4/atapiscsi.4
+++ b/share/man/man4/atapiscsi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atapiscsi.4,v 1.8 2001/10/05 14:45:53 mpech Exp $
+.\"	$OpenBSD: atapiscsi.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1999 Constantine Sapuntzakis.
 .\"
@@ -26,7 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
 .Dd July 25, 1999
 .Dt ATAPISCSI 4
 .Os
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4
index 5a6d7297238..21451558d12 100644
--- a/share/man/man4/audio.4
+++ b/share/man/man4/audio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: audio.4,v 1.31 2003/04/25 18:09:42 avsm Exp $
+.\"	$OpenBSD: audio.4,v 1.32 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -148,7 +148,7 @@ The device appears as a block of memory
 of size
 .Va buffer_size
 (as available via
-.Dv AUDIO_GETINFO ).
+.Dv AUDIO_GETINFO ) .
 The device driver will continuously move data from this buffer
 from/to the audio hardware, wrapping around at the end of the buffer.
 To find out where the hardware is currently accessing data in the buffer the
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index 35365b9fccd..70450451d4a 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aue.4,v 1.15 2003/03/31 10:20:13 jmc Exp $
+.\"	$OpenBSD: aue.4,v 1.16 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: aue.4,v 1.9 2002/07/11 00:23:31 rh Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
@@ -119,7 +119,8 @@ implies
 mode.
 .It 100baseTX
 Set 100Mbps (Fast
-.Tn Ethernet) operation.
+.Tn Ethernet )
+operation.
 The
 .Ar mediaopt
 option can also be used to enable
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 44c51acd4a8..6ebdb4ad805 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: awi.4,v 1.12 2003/02/15 09:39:43 jmc Exp $
+.\"	$OpenBSD: awi.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"     $NetBSD: awi.4,v 1.1 1999/11/04 19:36:01 sommerfeld Exp $
-.\" 
+.\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
@@ -34,7 +34,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .Dd October 31, 1999
 .Dt AWI 4
 .Os
diff --git a/share/man/man4/az.4 b/share/man/man4/az.4
index e821be9a4d7..b489dc94ca8 100644
--- a/share/man/man4/az.4
+++ b/share/man/man4/az.4
@@ -1,5 +1,5 @@
 .\"	$RuOBSD: az.4,v 1.3 2001/10/26 05:38:43 form Exp $
-.\"	$OpenBSD: az.4,v 1.5 2003/03/14 10:07:35 jmc Exp $
+.\"	$OpenBSD: az.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .Dt AZ 4
 .Os
 .Sh NAME
-.Nm az 
+.Nm az
 .Nd Aztech/PackardBell radio card device driver
 .Sh SYNOPSIS
 .Cd "az0   at isa? port 0x350"
@@ -53,15 +53,16 @@ The I/O port is set by the driver to the value specified in the configuration
 file.
 The I/O port must be one of
 0x350 and 0x358.
-.Sh BUGS
-It is impossible to determine which frequency the card is tuned to.
-Thus, the driver will report an internally stored value even if it is not
-correct (changed by some program that uses direct port access).
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr isa 4 ,
 .Xr radio 4 ,
 .Xr radio 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -71,8 +72,7 @@ and
 .An Maxim Tsyplakov Aq tm@oganer.net .
 The man page was written by
 .An Vladimir Popov Aq jumbo@narod.ru .
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 3.0 .
+.Sh BUGS
+It is impossible to determine which frequency the card is tuned to.
+Thus, the driver will report an internally stored value even if it is not
+correct (changed by some program that uses direct port access).
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 67e89f27213..a1418229bbe 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: bktr.4,v 1.4 2003/04/01 19:34:31 jmc Exp $
+.\" $OpenBSD: bktr.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\" $FreeBSD: /c/ncvs/src/share/man/man4/bktr.4,v 1.9.2.5 2001/03/06 19:08:09 ru Exp $
 .\"
 .Dd January 28, 1998
@@ -53,7 +53,7 @@ This should support most video cards based on the
 Brooktree Bt848/849/878/879 Video Capture Chip.
 The driver also supports FM Radio if the Tuner supports it.
 .Pp
-Specifically, the following cards are known to work: 
+Specifically, the following cards are known to work:
 .Bd -unfilled -offset indent
 Hauppage Wincast TV and WinTV/PCI
 STB TV PCI Television Tuner
@@ -93,6 +93,11 @@ This fixed random hangs and lockups with the VideoLogic Captivator PCI card.
 .Xr intro 4 ,
 .Xr pci 4 ,
 .Xr radio 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 2.2 .
 .Sh AUTHORS
 The
 .Nm
@@ -102,11 +107,6 @@ driver is based on the work of
 .An Amancio Hasty Aq hasty@star\-gate.com ,
 .An Roger Hardiman Aq roger@FreeBSD.org
 and a bunch of other people.
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Fx 2.2 .
 .Sh CAVEATS
 On big-endian architectures it is not possible to program the
 card to perform proper byte swapping in 24 bit modes,
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index b043e512fb5..5c215827af5 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bpf.4,v 1.14 2003/01/28 10:40:20 jmc Exp $
+.\"	$OpenBSD: bpf.4,v 1.15 2003/06/06 10:29:41 jmc Exp $
 .\"     $NetBSD: bpf.4,v 1.7 1995/09/27 18:31:50 thorpej Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -813,6 +813,11 @@ interface provides the following macros to facilitate array initializers:
 .Ar true_offset ,
 .Ar false_offset Ns No )
 .Ed
+.Sh FILES
+.Bl -tag -width /dev/bpf[0-9] -compact
+.It Pa /dev/bpf[0-9]
+BPF devices
+.El
 .Sh EXAMPLES
 The following filter is taken from the Reverse ARP daemon.
 It accepts only Reverse ARP requests.
@@ -882,14 +887,6 @@ struct bpf_insn insns[] = {
 .%A McCanne, S., Jacobson V.
 .%J "An efficient, extensible, and portable network monitor"
 .Re
-.Sh FILES
-.Bl -tag -width /dev/bpf[0-9] -compact
-.It Pa /dev/bpf[0-9]
-BPF devices
-.El
-.Sh AUTHORS
-Steve McCanne of Lawrence Berkeley Laboratory implemented BPF in Summer 1990.
-Much of the design is due to Van Jacobson.
 .Sh HISTORY
 The Enet packet filter was created in 1980 by Mike Accetta and Rick Rashid
 at Carnegie-Mellon University.
@@ -897,6 +894,9 @@ Jeffrey Mogul, at Stanford, ported the code to BSD and continued its
 development from 1983 on.
 Since then, it has evolved into the Ultrix Packet Filter at DEC, a STREAMS
 NIT module under SunOS 4.1, and BPF.
+.Sh AUTHORS
+Steve McCanne of Lawrence Berkeley Laboratory implemented BPF in Summer 1990.
+Much of the design is due to Van Jacobson.
 .Sh BUGS
 The read buffer must be of a fixed size (returned by the
 .Dv BIOCGBLEN
@@ -911,4 +911,3 @@ is promiscuous, and if so desired, must utilize a filter to reject foreign
 packets.
 .Pp
 Data link protocols with variable length headers are not currently supported.
-.Pp
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 3290f5e261c..4480515699a 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bridge.4,v 1.49 2003/06/02 18:51:33 jason Exp $
+.\"	$OpenBSD: bridge.4,v 1.50 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -593,7 +593,7 @@ Non-IP packets which are too large for the outgoing interface will be
 dropped.
 .Pp
 If the LINK2 flag is set on the
-.Xr bridge 4
+.Nm bridge
 interface, the bridge will also perform transparent
 .Xr ipsec 4
 processing on the packets (encrypt or decrypt them), according to the
@@ -623,19 +623,19 @@ and certificates, to impersonate the protected host(s).
 .Xr brconfig 8 ,
 .Xr ipsecadm 8 ,
 .Xr isakmpd 8
+.Sh HISTORY
+The
+.Xr brconfig 8
+command and the
+.Nm bridge
+kernel interface first appeared in
+.Ox 2.5 .
 .Sh AUTHORS
 The
 .Xr brconfig 8
 command and the
-.Xr bridge 4
+.Nm bridge
 kernel interface were written by
 .An Jason L. Wright Aq jason@thought.net
 as part of an undergraduate independent study at the
 University of North Carolina at Greensboro.
-.Sh HISTORY
-The
-.Xr brconfig 8
-command and the
-.Xr bridge 4
-kernel interface first appeared in
-.Ox 2.5 .
diff --git a/share/man/man4/cac.4 b/share/man/man4/cac.4
index c2ca35350e5..226a5c912ad 100644
--- a/share/man/man4/cac.4
+++ b/share/man/man4/cac.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cac.4,v 1.9 2002/10/04 16:17:01 mickey Exp $
+.\"	$OpenBSD: cac.4,v 1.10 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000,2001 Michael Shalayeff.  All rights reserved.
 .\" Public Domain.
@@ -45,6 +45,11 @@ All RAID configuration is done through the controllers' BIOSes.
 .Xr pci 4 ,
 .Xr scsi 4 ,
 .Xr sd 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 2.9 .
 .Sh AUTHORS
 The
 .Nm
@@ -54,11 +59,6 @@ inspired by the
 .Nx
 driver by
 .An Andrew Doran Aq ad@netbsd.org .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 2.9 .
 .Sh BUGS
 The card provides a mechanism to receive asynchronous notifications
 about RAID set status change and so forth, unfortunately this
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 968a8228201..78e4468ec4b 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cy.4,v 1.8 2003/05/07 08:13:20 jmc Exp $
+.\"	$OpenBSD: cy.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Herbert.
 .\" All rights reserved.
@@ -74,11 +74,6 @@ defined (the default) in order for this condition to be logged.
 .Xr intro 4 ,
 .Xr termios 4 ,
 .Xr tty 4
-.Sh AUTHORS
-The driver was written by
-.An Andrew Herbert Aq andrew@werple.apana.org.au ,
-and is still
-.Ud
 .Sh HISTORY
 Some ideas for the architecture of this driver's two-layer processing model
 were derived from the fas 2.10 driver by
@@ -90,6 +85,11 @@ This work was made possible through the donation of a Cyclom-8Y board by the
 manufacturer, Cyclades Corporation.
 However, neither Cyclades nor the author make any warranties regarding
 this software, nor guarantees of support.
+.Sh AUTHORS
+The driver was written by
+.An Andrew Herbert Aq andrew@werple.apana.org.au ,
+and is still
+.Ud
 .Sh BUGS
 There is currently no BREAK handling - breaks are ignored.
 There is no support for bad-character reporting, except via PARMRK.
diff --git a/share/man/man4/cz.4 b/share/man/man4/cz.4
index afb4dcbded7..de73f506265 100644
--- a/share/man/man4/cz.4
+++ b/share/man/man4/cz.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cz.4,v 1.5 2002/09/26 07:55:39 miod Exp $
+.\"	$OpenBSD: cz.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: cz.4,v 1.3 2001/06/12 14:46:11 wiz Exp $
 .\"
 .\" Copyright (c) 2000 Zembu Labs, Inc.
@@ -107,6 +107,14 @@ The
 .Nm
 driver first appeared in
 .Ox 3.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Jason R. Thorpe Aq thorpej@zembu.com
+and
+.An Bill Studenmund Aq wrstuden@zembu.com
+of Zembu Labs, Inc.
 .Sh BUGS
 The
 .Nm
@@ -121,11 +129,3 @@ Interrupt mode has not been tested.
 .Pp
 There is no support for reading or writing the EEPROM connected to
 the PLX PCI bus controller.
-.Sh AUTHORS
-The
-.Nm
-driver was written by
-.An Jason R. Thorpe Aq thorpej@zembu.com
-and
-.An Bill Studenmund Aq wrstuden@zembu.com
-of Zembu Labs, Inc.
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index ff9999fdfad..8a90372f115 100644
--- a/share/man/man4/de.4
+++ b/share/man/man4/de.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: de.4,v 1.13 2003/03/16 10:18:44 jmc Exp $
+.\"	$OpenBSD: de.4,v 1.14 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1997 David E. O'Brien
 .\"
@@ -117,9 +117,6 @@ devices allowed in a single machine.
 .It "de%d: not configured; 21140 pass 1.1 required (%d.%d found)"
 Certain revisions of the chipset are not supported by this driver.
 .El
-.Sh CAVEATS
-Since the 21040 is available on both EISA and PCI boards, one must be careful
-in how one defines the 21040 in the kernel config file.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
@@ -133,3 +130,6 @@ The
 .Nm
 device driver was written by Matt Thomas.
 This manual page was written by David E. O'Brien.
+.Sh CAVEATS
+Since the 21040 is available on both EISA and PCI boards, one must be careful
+in how one defines the 21040 in the kernel config file.
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index e029c1b9bda..3e70fae6586 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dpt.4,v 1.13 2003/03/16 10:18:44 jmc Exp $
+.\"	$OpenBSD: dpt.4,v 1.14 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: dpt.4,v 1.7 2000/01/17 16:34:44 ad Exp $
 .\"
 .\" Copyright (c) 1999, 2000 Andy Doran <ad@NetBSD.org>
@@ -69,6 +69,13 @@ A corrupt or incomplete status packet was received from the HBA.
 .Xr scsi 4 ,
 .Xr sd 4 ,
 .Xr st 4
+.Sh HISTORY
+This manpage is inadequate.
+.Pp
+The
+.Nm
+driver first appeared in
+.Ox 2.5 .
 .Sh AUTHORS
 The
 .Nm
@@ -79,13 +86,6 @@ based upon the
 and
 .Nm bha
 drivers, which are the work of others.
-.Sh HISTORY
-This manpage is inadequate.
-.Pp
-The
-.Nm
-driver first appeared in
-.Ox 2.5 .
 .Sh BUGS
 The first (0th) and subsequent (for multi-channel cards)
 .Xr scsibus 4
diff --git a/share/man/man4/eisa.4 b/share/man/man4/eisa.4
index 6f7f2bf4b4a..ebdad39af76 100644
--- a/share/man/man4/eisa.4
+++ b/share/man/man4/eisa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eisa.4,v 1.7 2003/05/05 13:51:57 jmc Exp $
+.\"	$OpenBSD: eisa.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: eisa.4,v 1.10 2001/09/11 22:52:52 wiz Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -143,7 +143,7 @@ supported bus variants.
 .Xr ep 4 ,
 .Xr fea 4 ,
 .Xr intro 4 ,
-.Xr uha 4 ,
+.Xr uha 4
 .Sh HISTORY
 The machine-independent
 .Tn EISA
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 507565274e4..82fd3657728 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -1,34 +1,34 @@
-.\" $OpenBSD: em.4,v 1.7 2003/03/06 04:03:40 david Exp $
+.\" $OpenBSD: em.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\" Copyright (c) 2002 Intel Corporation
 .\" All rights reserved.
-.\" Redistribution and use in source and binary forms of the Software, with or without 
-.\" modification, are permitted provided that the following conditions 
+.\" Redistribution and use in source and binary forms of the Software, with or without
+.\" modification, are permitted provided that the following conditions
 .\" are met:
-.\" 1. Redistributions of source code of the Software may retain the above 
+.\" 1. Redistributions of source code of the Software may retain the above
 .\" copyright notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form of the Software may reproduce the 
-.\" above copyright notice, this list of conditions and the following 
-.\" disclaimer in the documentation and/or other materials provided with the 
+.\" 2. Redistributions in binary form of the Software may reproduce the
+.\" above copyright notice, this list of conditions and the following
+.\" disclaimer in the documentation and/or other materials provided with the
 .\" distribution.
-.\" 3. Neither the name of the Intel Corporation nor the names of its contributors 
-.\" shall be used to endorse or promote products derived from this Software 
+.\" 3. Neither the name of the Intel Corporation nor the names of its contributors
+.\" shall be used to endorse or promote products derived from this Software
 .\" without specific prior written permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE 
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
 .\" $FreeBSD$
-.Dd March 1, 2002 
+.Dd March 1, 2002
 .Dt EM 4
 .Os
 .Sh NAME
@@ -85,12 +85,12 @@ Sets 10Mbps operation.
 Sets 100Mbps operation.
 .It Cm media No 1000baseSX
 Sets 1000Mbps operation.
-Only 
+Only
 full-duplex
 mode is supported at this speed.
 .It Cm media No 1000baseT
 Sets 1000Mbps operation.
-Only 
+Only
 full-duplex
 mode is supported at this speed.
 .El
diff --git a/share/man/man4/ep.4 b/share/man/man4/ep.4
index bc1abae582c..35fd3e415cc 100644
--- a/share/man/man4/ep.4
+++ b/share/man/man4/ep.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ep.4,v 1.25 2002/09/26 07:55:39 miod Exp $
+.\"	$OpenBSD: ep.4,v 1.26 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Herb Peyerl
 .\" All rights reserved.
@@ -156,10 +156,10 @@ Erase the pencil mark and reboot.
 .Xr eisa 4 ,
 .Xr el 4 ,
 .Xr ie 4 ,
-.Xr isa 4 ,
-.Xr isapnp 4 ,
 .Xr ifmedia 4 ,
 .Xr intro 4 ,
+.Xr isa 4 ,
+.Xr isapnp 4 ,
 .Xr pci 4 ,
 .Xr pcmcia 4 ,
 .Xr xl 4 ,
diff --git a/share/man/man4/esis.4 b/share/man/man4/esis.4
index 5e298be2112..bced4de95cc 100644
--- a/share/man/man4/esis.4
+++ b/share/man/man4/esis.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: esis.4,v 1.8 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: esis.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: esis.4,v 1.3 1994/11/30 16:22:12 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -34,7 +34,7 @@
 .Dt ESIS 4
 .Os
 .Sh NAME
-.Nm es-is
+.Nm ES-IS
 .Nd End System to Intermediate System Routing Protocol
 .Sh SYNOPSIS
 .Sy pseudo-device Nm ether
@@ -158,7 +158,7 @@ a redirect
 is generated.
 .Sh MANUAL ROUTING TABLE MODIFICATION
 To facilitate communications with systems which do not use
-.Nm ES-IS,
+.Nm ES-IS ,
 one may add a route whose destination is a sockaddr_iso containing
 the
 .Tn NSAP
diff --git a/share/man/man4/eso.4 b/share/man/man4/eso.4
index 10f86e2da06..27db2d31e15 100644
--- a/share/man/man4/eso.4
+++ b/share/man/man4/eso.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: eso.4,v 1.4 2002/09/26 07:55:39 miod Exp $
+.\"	$OpenBSD: eso.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: eso.4,v 1.2 1999/08/02 17:43:52 augustss Exp $
 .\"
 .\" Copyright (c) 1999 Klaus J. Klein
@@ -58,8 +58,6 @@ The driver timed out reading data from a controller register.
 The driver timed out waiting to send a command or writing to a controller
 register.
 .El
-.Sh BUGS
-The game port and MIDI port are not supported.
 .Sh SEE ALSO
 .Xr audio 4 ,
 .Xr intro 4 ,
@@ -71,3 +69,5 @@ The
 .Nm
 device driver appeared in
 .Ox 2.5 .
+.Sh BUGS
+The game port and MIDI port are not supported.
diff --git a/share/man/man4/ess.4 b/share/man/man4/ess.4
index d00f8e5eb67..c9a6b662b4c 100644
--- a/share/man/man4/ess.4
+++ b/share/man/man4/ess.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ess.4,v 1.7 2003/05/05 13:51:57 jmc Exp $
+.\"	$OpenBSD: ess.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ess.4,v 1.6 1999/04/13 20:25:29 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -69,13 +69,6 @@ If both DRQ channels are used they must be different.
 The joystick interface (if enabled) is handled by the
 .Xr joy 4
 driver.
-.Sh BUGS
-The AudioDrive devices have a SoundBlaster compatibility mode, and may
-be detected by the SoundBlaster driver (see
-.Xr sb 4 )
-rather than the AudioDrive driver.
-The workaround is to remove or disable the SoundBlaster driver from the kernel
-configuration.
 .Sh SEE ALSO
 .Xr audio 4 ,
 .Xr intro 4 ,
@@ -88,3 +81,10 @@ The
 .Nm
 device driver appeared in
 .Ox 2.2 .
+.Sh BUGS
+The AudioDrive devices have a SoundBlaster compatibility mode, and may
+be detected by the SoundBlaster driver (see
+.Xr sb 4 )
+rather than the AudioDrive driver.
+The workaround is to remove or disable the SoundBlaster driver from the kernel
+configuration.
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index 3b9450bb51f..0d68c4894ce 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: faith.4,v 1.11 2003/01/18 23:53:49 deraadt Exp $
+.\"	$OpenBSD: faith.4,v 1.12 2003/06/06 10:29:41 jmc Exp $
 .\"	$KAME: faith.4,v 1.10 2001/06/30 00:42:48 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -55,7 +55,7 @@ The packet is captured by an IPv6 TCP socket, if it has the
 flag turned on and it has matching address/port pairs.
 Thus,
 .Nm
-allows captured IPv6 TCP traffic to be relayed to some 
+allows captured IPv6 TCP traffic to be relayed to some
 specific destination addresses.
 Userland programs, such as
 .Xr faithd 8
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 034399f2297..b2c3fd6890e 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdc.4,v 1.7 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: fdc.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: fdc.4,v 1.6 1996/03/22 01:55:14 andrew Exp $
 .\"
 .\" Copyright (c) 1996 Andrew C. Wheadon
@@ -106,4 +106,4 @@ in the
 driver probes for a missing second floppy drive.
 In this case you should try recompiling the kernel
 replacing the relevant line with
-.Cd "fd0 at fdc? drive ?".
+.Cd "fd0 at fdc? drive ?" .
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 00f35571966..11e8e39c6c7 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fpa.4,v 1.16 2003/05/10 21:17:21 jmc Exp $
+.\"	$OpenBSD: fpa.4,v 1.17 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: fpa.4,v 1.2 1997/02/18 01:07:46 jonathan Exp $
 .\"
 .\" Copyright (c) 1995, Matt Thomas
@@ -36,11 +36,6 @@ requires a minimum of 1K device memory be set up.
 The ECU (EISA Configuration Utility) will need to be run to change
 the settings.
 .El
-.Sh CAVEATS
-Normally, the device driver will not enable the reception of SMT frames.
-However if the IFF_LINK1 flag is set, the device driver will enable the
-reception of SMT frames and pass them up to the Berkeley Packet Filter for
-processing.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr eisa 4 ,
@@ -54,3 +49,8 @@ The
 and
 .Nm fea
 device driver and manual page was written by Matt Thomas.
+.Sh CAVEATS
+Normally, the device driver will not enable the reception of SMT frames.
+However if the IFF_LINK1 flag is set, the device driver will enable the
+reception of SMT frames and pass them up to the Berkeley Packet Filter for
+processing.
diff --git a/share/man/man4/gdt.4 b/share/man/man4/gdt.4
index feeefbc40f7..09945dbe328 100644
--- a/share/man/man4/gdt.4
+++ b/share/man/man4/gdt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gdt.4,v 1.17 2003/03/16 10:18:44 jmc Exp $
+.\"	$OpenBSD: gdt.4,v 1.18 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
 .\"
@@ -107,6 +107,11 @@ If the diagnostic is considered a nuisance, alter jumper J4's setting.
 .Xr pci 4 ,
 .Xr scsi 4 ,
 .Xr sd 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 2.7 .
 .Sh AUTHORS
 The
 .Nm
@@ -114,11 +119,6 @@ driver was written by
 .An Niklas Hallqvist Aq niklas@openbsd.org ,
 inspired by the Linux driver by
 .An Achim Luebner Aq achim@vortex.de .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 2.7 .
 .Sh BUGS
 An ISA & EISA front-end is needed.
 .Pp
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 7ac78e4a180..4a35d7a1b80 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.17 2003/04/01 08:55:39 jmc Exp $
+.\" $OpenBSD: gre.4,v 1.18 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -44,8 +44,8 @@
 .Sh SYNOPSIS
 .Cd pseudo-device gre Op Ar count
 .Sh NOTE
-.Tn GRE,
-.Tn WCCPv1,
+.Tn GRE ,
+.Tn WCCPv1 ,
 and
 .Tn MobileIP
 are enabled with the following
@@ -133,36 +133,40 @@ Host X-- Host A  ----------------tunnel---------- Cisco D------Host E
              +------Host B----------Host C----------+
 
 .Ed
-   On Host A (OpenBSD):
-
-   # route add default B
-   # ifconfig greN A D netmask 0xffffffff linkX up
-   # ifconfig greN tunnel A D
-   # route add E D
-
-   On Host D (Cisco):
-
-   Interface TunnelX 	
-    ip unnumbered D   ! e.g. address from Ethernet interface
-    tunnel source D   ! e.g. address from Ethernet interface
-    tunnel destination A
-   ip route C <some interface and mask>
-   ip route A mask C
-   ip route X mask tunnelX
-
-   OR
-
-   On Host D (OpenBSD):
-
-   # route add default C
-   # ifconfig greN D A
-   # ifconfig greN tunnel D A
+On Host A (OpenBSD):
+.Bd -literal -offset indent
+# route add default B
+# ifconfig greN A D netmask 0xffffffff linkX up
+# ifconfig greN tunnel A D
+# route add E D
+.Ed
+.Pp
+On Host D (Cisco):
+.Bd -literal -offset indent
+Interface TunnelX
+ ip unnumbered D   ! e.g. address from Ethernet interface
+ tunnel source D   ! e.g. address from Ethernet interface
+ tunnel destination A
+ip route C <some interface and mask>
+ip route A mask C
+ip route X mask tunnelX
+.Ed
+.Pp
+OR
+.Pp
+On Host D (OpenBSD):
+.Pp
+.Bd -literal -offset indent
+# route add default C
+# ifconfig greN D A
+# ifconfig greN tunnel D A
+.Ed
 .Pp
 To reach Host A over the tunnel (from host D), there has to be an
 alias on Host A for the Ethernet interface:
-     ifconfig <etherif> alias Y
- and on the Cisco
-     ip route Y mask tunnelX
+.Dl ifconfig <etherif> alias Y
+and on the Cisco
+.Dl ip route Y mask tunnelX
 .Sh NOTE
 For correct operation, the
 .Nm
@@ -204,10 +208,13 @@ A description of WCCPv1 can be found in draft-ietf-wrec-web-pro-00.txt,
 and WCCPv2 in draft-wilson-wrec-wccp-v2-00.txt.
 Both of these documents
 can be found at http://www.wrec.org/ (at the time of this writing).
+.Sh AUTHORS
+.An Heiko W.Rupp Aq hwr@pilhuhn.de
 .Sh BUGS
-The compute_route() code in net/if_gre.c toggles the last bit of the
-IP-address to provoke the search for a less specific route than the
-one directly over the tunnel to prevent loops.
+The compute_route() code in
+.Pa net/if_gre.c
+toggles the last bit of the IP-address to provoke the search for a less
+specific route than the one directly over the tunnel to prevent loops.
 This is possibly not the best solution.
 .Pp
 To avoid the address munging described above, turn on the link1 flag
@@ -223,5 +230,3 @@ GRE RFC not yet fully implemented (no GRE options).
 For the WCCP GRE encapsulated packets we can only reliably accept
 WCCPv1 format; WCCPv2 formatted packets add another header which will
 skew the decode, and results are not defined (i.e. don't do WCCPv2).
-.Sh AUTHORS
-Heiko W.Rupp <hwr@pilhuhn.de>
diff --git a/share/man/man4/gtp.4 b/share/man/man4/gtp.4
index 2ecbfe993af..b442a6e7689 100644
--- a/share/man/man4/gtp.4
+++ b/share/man/man4/gtp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gtp.4,v 1.4 2003/03/16 10:18:44 jmc Exp $
+.\"	$OpenBSD: gtp.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Vladimir Popov <jumbo@narod.ru>
 .\" All rights reserved.
@@ -50,22 +50,22 @@ for details.
 The flags control the driver behavior.
 For example, with flags 0x01 the driver
 will assume that a TEA5759 chip is used.
-.Sh BUGS
-It is impossible to determine which frequency the card is tuned to.
-Thus, the driver will report an internally stored value even if it is not
-correct (changed by some program that uses direct port access).
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr pci 4 ,
 .Xr radio 4 ,
 .Xr radio 9
-.Sh AUTHORS
-The
-.Nm
-driver and the man page was written by
-.An Vladimir Popov Aq jumbo@narod.ru .
 .Sh HISTORY
 The
 .Nm
 device driver appeared in
 .Ox 3.2 .
+.Sh AUTHORS
+The
+.Nm
+driver and the man page was written by
+.An Vladimir Popov Aq jumbo@narod.ru .
+.Sh BUGS
+It is impossible to determine which frequency the card is tuned to.
+Thus, the driver will report an internally stored value even if it is not
+correct (changed by some program that uses direct port access).
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index dd49b04313d..2a1743beaee 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hifn.4,v 1.35 2003/06/02 18:52:50 deraadt Exp $
+.\"	$OpenBSD: hifn.4,v 1.36 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt
 .\" All rights reserved.
@@ -81,13 +81,6 @@ and
 will also supply data to the kernel
 .Xr random 4
 subsystem.
-.Sh BUGS
-The 7751 chip starts out at initialization by only supporting compression.
-A proprietary algorithm, which has been reverse engineered, is required to
-unlock the cryptographic functionality of the chip.
-It is possible for vendors to make boards which have a lock ID not known
-to the driver, but all vendors currently just use the obvious ID which is
-13 bytes of 0.
 .Sh SEE ALSO
 .Xr crypt 3 ,
 .Xr crypto 4 ,
@@ -100,3 +93,10 @@ The
 .Nm
 device driver appeared in
 .Ox 2.7 .
+.Sh BUGS
+The 7751 chip starts out at initialization by only supporting compression.
+A proprietary algorithm, which has been reverse engineered, is required to
+unlock the cryptographic functionality of the chip.
+It is possible for vendors to make boards which have a lock ID not known
+to the driver, but all vendors currently just use the obvious ID which is
+13 bytes of 0.
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 1123b308f96..0f694cf9e51 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: icmp6.4,v 1.12 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: icmp6.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"	$KAME: icmp6.4,v 1.3 2000/11/24 08:44:40 itojun Exp $
 .\"
 .\" Copyright (C) 1999 WIDE Project.
@@ -219,8 +219,8 @@ when an attempt is made to create a
 socket with a network address for which no network interface exists.
 .El
 .Sh SEE ALSO
-.Xr send 2 ,
 .Xr recv 2 ,
+.Xr send 2 ,
 .Xr inet6 4 ,
 .Xr ip6 4 ,
 .Xr netintro 4
diff --git a/share/man/man4/ifmedia.4 b/share/man/man4/ifmedia.4
index 964988817b7..f207d69ce47 100644
--- a/share/man/man4/ifmedia.4
+++ b/share/man/man4/ifmedia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifmedia.4,v 1.10 2003/01/13 19:06:42 kjell Exp $
+.\"	$OpenBSD: ifmedia.4,v 1.11 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ifmedia.4,v 1.14 2001/06/30 17:57:56 bjh21 Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ The media is typically set using the
 command.
 .Pp
 There are currently four link types supported by
-.Nm Ns :
+.Nm ifmedia :
 .Bl -tag -offset indent -width IFM_IEEE80211 -compact
 .It Dv IFM_ETHER
 Ethernet
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 2ccb439aa94..e7487a47eb7 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet.4,v 1.11 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: inet.4,v 1.12 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: inet.4,v 1.3 1994/11/30 16:22:18 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 The Internet protocol family is a collection of protocols
 layered atop the
-.Em Internet  Protocol
+.Em Internet Protocol
 .Pq Tn IP
 transport layer, and utilizing the Internet address format.
 The Internet family provides protocol support for the
@@ -172,13 +172,13 @@ Get interface network mask.
 .%B PS1
 .%N 8
 .Re
-.Sh CAVEATS
-The Internet protocol support is subject to change as
-the Internet protocols develop.
-Users should not depend on details of the current implementation, but rather
-the services exported.
 .Sh HISTORY
 The
 .Nm
 protocol interface appeared in
 .Bx 4.2 .
+.Sh CAVEATS
+The Internet protocol support is subject to change as
+the Internet protocols develop.
+Users should not depend on details of the current implementation, but rather
+the services exported.
diff --git a/share/man/man4/ioprbs.4 b/share/man/man4/ioprbs.4
index fe67dd5233b..6fc4d11fe97 100644
--- a/share/man/man4/ioprbs.4
+++ b/share/man/man4/ioprbs.4
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: ioprbs.4,v 1.9 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: ioprbs.4,v 1.10 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
 .\"
 .\"
-.Dd July 4, 20010
+.Dd July 4, 2001
 .Dt IOPRBS 4
 .Os
 .Sh NAME
@@ -39,6 +39,11 @@ All RAID configuration is done through the controllers' BIOSes.
 .Xr iop 4 ,
 .Xr iopsp 4 ,
 .Xr scsi 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -48,8 +53,3 @@ inspired by the
 .Nx
 ld_iop driver by
 .An Andrew Doran Aq ad@netbsd.org .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 3.0 .
diff --git a/share/man/man4/iopsp.4 b/share/man/man4/iopsp.4
index 9c0507ad3b6..29ad559c29a 100644
--- a/share/man/man4/iopsp.4
+++ b/share/man/man4/iopsp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iopsp.4,v 1.6 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: iopsp.4,v 1.7 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: iopsp.4,v 1.2 2000/12/11 13:11:59 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@ peripherals.
 .Pp
 IOPs present each child peripheral attached to a bus adapter port as an
 individual device.
-In order to present the appearance of a bus, the 
+In order to present the appearance of a bus, the
 .Nm
 driver groups child peripherals by controlling port.
 .Pp
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index c9afeb0b1a6..927d1e03330 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ip.4,v 1.20 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: ip.4,v 1.21 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ip.4,v 1.3 1994/11/30 16:22:19 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -150,7 +150,7 @@ multicasting is supported only on
 sockets of type
 .Dv SOCK_DGRAM
 and
-.Dv SOCK_RAW,
+.Dv SOCK_RAW ,
 and only on networks where the interface
 driver supports multicasting.
 .Pp
@@ -344,7 +344,7 @@ Additionally note that starting with
 .Ox 2.1 ,
 the ip_off and ip_len fields are in network byte order.
 If the header source address is set to
-.Dv INADDR_ANY,
+.Dv INADDR_ANY ,
 the kernel will choose an appropriate address.
 .Sh DIAGNOSTICS
 A socket operation may fail with one of the following errors returned:
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index e94b701985d..c888dfdd694 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ip6.4,v 1.14 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: ip6.4,v 1.15 2003/06/06 10:29:41 jmc Exp $
 .\"	$KAME: ip6.4,v 1.12 2000/06/08 21:19:39 itojun Exp $
 .\"
 .\" Copyright (C) 1999 WIDE Project.
@@ -102,7 +102,7 @@ To specify some socket options, a certain level of privilege
 may be used to set the hoplimit field in the
 .Tn IPv6
 header.
-As the symbol name suggests, the option controls the hoplimit field 
+As the symbol name suggests, the option controls the hoplimit field
 on unicast packets.
 If -1 is specified, the kernel will use a default value.
 If a value of 0 to 255 is specified, the packet will have the specified
@@ -122,7 +122,7 @@ multicasting is supported only on
 sockets of type
 .Dv SOCK_DGRAM
 and
-.Dv SOCK_RAW,
+.Dv SOCK_RAW ,
 and only on networks where the interface driver supports multicasting.
 .Pp
 The
@@ -566,7 +566,7 @@ setsockopt(fd, IPPROTO_IPV6, IPV6_CHECKSUM, &offset, sizeof(offset));
 .Pp
 By default, this socket option is disabled.
 Setting the offset to -1 also disables the option.
-By disabled we mean (1) the kernel will 
+By disabled we mean (1) the kernel will
 not calculate and store a checksum for outgoing packets, and (2) the
 kernel will not verify a checksum for received packets.
 .Pp
@@ -606,9 +606,9 @@ The ancillary data items were improperly formed, or option name was unknown.
 .\"
 .Sh SEE ALSO
 .Xr getsockopt 2 ,
+.Xr recv 2 ,
 .Xr send 2 ,
 .Xr setsockopt 2 ,
-.Xr recv 2 ,
 .Xr inet6_option_space 3 ,
 .Xr inet6_rthdr_space 3 ,
 .Xr icmp6 4 ,
diff --git a/share/man/man4/ipcomp.4 b/share/man/man4/ipcomp.4
index b047f4987d4..c1c1c659132 100644
--- a/share/man/man4/ipcomp.4
+++ b/share/man/man4/ipcomp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipcomp.4,v 1.8 2001/10/04 10:28:20 wilfried Exp $
+.\" $OpenBSD: ipcomp.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jj@wabbitt.org>
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .Nd IP Payload Compression Protocol
 .Sh NOTE
 .Tn IPComp
-is enabled with the following 
+is enabled with the following
 .Xr sysctl 3
 variable in
 .Pa /etc/sysctl.conf :
@@ -52,10 +52,10 @@ datagrams, provided the communicating entities have enough computation
 power.
 .Pp
 This protocol is especially useful when encryption or authentication
-is applied to IP datagrams using the 
+is applied to IP datagrams using the
 .Tn IPsec
 protocol (see
-.Xr ipsec 4  
+.Xr ipsec 4
 for more information about IPsec).
 Encrypting information is increasing its entropy to a point where
 compression to a lower layer becomes completely useless (e.g., the
@@ -69,17 +69,17 @@ or
 .Pp
 Just like for the other IPsec protocols, IPComp needs some parameters
 for each connection, specifying how the compression should be done
-between the entities. 
+between the entities.
 The parameters are collected in a structure called an
 IPComp Association or IPCA.
 The parameters stored in an IPCA are the destination address and the
 Compression Parameter Index (CPI).
 An IPCA is the pendant of the SA (Security Association) for IPsec.
 .Pp
-Currently, IPCA can be created using the 
+Currently, IPCA can be created using the
 .Xr ipsecadm 8
 tool.
-Using 
+Using
 .Xr ipsecadm 8
 it is also possible to create IPComp flows and SA/IPCA
 bundles.
@@ -94,7 +94,7 @@ compressed since they are modified by the router along the way to the
 destination.
 These extension headers are hop-by-hop, routing, and fragmentation.
 .Pp
-When doing compression, it is possible that the uncompressed data is 
+When doing compression, it is possible that the uncompressed data is
 smaller in size than the compressed data.
 To avoid this behaviour, a non expansion policy is used in IPComp.
 If the data payload is smaller than a given threshold, it will not be
@@ -103,7 +103,7 @@ No IPComp header will be inserted.
 .Pp
 IPComp uses the same policy framework as IPsec.
 However unlike IPsec, only one policy is available for IPComp:
-.Bl -tag -width IPSEC_LEVEL_USE 
+.Bl -tag -width IPSEC_LEVEL_USE
 .It IPSEC_LEVEL_USE
 Use IPComp for sending packets but still accept packets which are not
 compressed.
@@ -111,7 +111,7 @@ compressed.
 .Sh DIAGNOSTICS
 .Xr netstat 1
 can be used to obtain some statistics about IPComp usage, using the
-.Fl p 
+.Fl p
 flag.
 Just like for IPsec, using the
 .Fl r
@@ -131,7 +131,7 @@ The
 protocol first appeared in
 .Ox 3.0 .
 .Sh AUTHORS
-Support for the 
-.Nm 
-protocol was written by Jean-Jacques
-Bernard-Gundol <jj@wabbitt.org>.
+Support for the
+.Nm
+protocol was written by
+.An Jean-Jacques Bernard-Gundol Aq jj@wabbitt.org .
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 557e0b80a5c..7ee071d1f1d 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.55 2003/05/27 13:21:19 jmc Exp $
+.\" $OpenBSD: ipsec.4,v 1.56 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -435,10 +435,6 @@ flows.
 displays information about memory use by IPsec with the
 .Fl m
 flag (look for ``tdb'' and ``xform'' allocations).
-.Sh BUGS
-There's a lot more to be said on this subject.
-This is just a beginning.
-At the moment the socket options are not fully implemented.
 .Sh SEE ALSO
 .Xr enc 4 ,
 .Xr icmp 4 ,
@@ -450,6 +446,19 @@ At the moment the socket options are not fully implemented.
 .Xr ipsecadm 8 ,
 .Xr isakmpd 8 ,
 .Xr vpn 8
+.Sh HISTORY
+The
+.Tn IPsec
+protocol design process was started in 1992 by John Ioannidis, Phil Karn
+and William Allen Simpson.
+In 1995, the former wrote an implementation for
+.Bsx .
+Angelos D. Keromytis ported it to
+.Ox
+and
+.Nx .
+The latest transforms and new features were
+implemented by Angelos D. Keromytis and Niels Provos.
 .Sh ACKNOWLEDGMENTS
 The authors of the
 .Tn IPsec
@@ -469,16 +478,7 @@ interface follows somewhat loosely the
 draft-mcdonald-simple-ipsec-api (since expired, but
 still available from
 .Pa ftp://ftp.kame.net/pub/internet-drafts/ )
-.Sh HISTORY
-The
-.Tn IPsec
-protocol design process was started in 1992 by John Ioannidis, Phil Karn
-and William Allen Simpson.
-In 1995, the former wrote an implementation for
-.Bsx .
-Angelos D. Keromytis ported it to
-.Ox
-and
-.Nx .
-The latest transforms and new features were
-implemented by Angelos D. Keromytis and Niels Provos.
+.Sh BUGS
+There's a lot more to be said on this subject.
+This is just a beginning.
+At the moment the socket options are not fully implemented.
diff --git a/share/man/man4/isapnp.4 b/share/man/man4/isapnp.4
index 64a89c45c91..dcafe7c1c05 100644
--- a/share/man/man4/isapnp.4
+++ b/share/man/man4/isapnp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isapnp.4,v 1.27 2003/05/20 04:25:59 mickey Exp $
+.\"	$OpenBSD: isapnp.4,v 1.28 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: isapnp.4,v 1.8 1998/06/07 09:08:46 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -106,6 +106,38 @@ PCMCIA controllers.
 .It Xr rt 4
 AIMS Lab Radiotrack FM radio tuners.
 .El
+.Sh SEE ALSO
+.Xr aha 4 ,
+.Xr aic 4 ,
+.Xr cardbus 4 ,
+.Xr com 4 ,
+.Xr ef 4 ,
+.Xr eisa 4 ,
+.Xr ep 4 ,
+.Xr ess 4 ,
+.Xr gus 4 ,
+.Xr intro 4 ,
+.Xr isa 4 ,
+.Xr joy 4 ,
+.Xr le 4 ,
+.Xr mpu 4 ,
+.Xr ne 4 ,
+.Xr pci 4 ,
+.Xr pcic 4 ,
+.Xr pcmcia 4 ,
+.Xr rt 4 ,
+.Xr sb 4 ,
+.Xr usb 4 ,
+.Xr wdc 4 ,
+.Xr we 4 ,
+.Xr wss 4 ,
+.Xr ym 4
+.Sh HISTORY
+The
+.Nm
+driver
+appeared in
+.Nx 1.3 .
 .Sh CAVEATS
 From time to time an
 .Nm
@@ -140,35 +172,3 @@ and a new kernel must be built.
 Then the device will probe like this:
 .Pp
 joy0 at isapnp0 <PnP Sound Chip, @P@1001, , > port 0x200/8
-.Sh SEE ALSO
-.Xr aha 4 ,
-.Xr aic 4 ,
-.Xr cardbus 4 ,
-.Xr com 4 ,
-.Xr ef 4 ,
-.Xr eisa 4 ,
-.Xr ep 4 ,
-.Xr ess 4 ,
-.Xr gus 4 ,
-.Xr intro 4 ,
-.Xr isa 4 ,
-.Xr joy 4 ,
-.Xr le 4 ,
-.Xr mpu 4 ,
-.Xr ne 4 ,
-.Xr pci 4 ,
-.Xr pcic 4 ,
-.Xr pcmcia 4 ,
-.Xr rt 4 ,
-.Xr sb 4 ,
-.Xr usb 4 ,
-.Xr wdc 4 ,
-.Xr we 4 ,
-.Xr wss 4 ,
-.Xr ym 4
-.Sh HISTORY
-The
-.Nm
-driver
-appeared in
-.Nx 1.3 .
diff --git a/share/man/man4/ises.4 b/share/man/man4/ises.4
index b3b7c167887..059cb104b27 100644
--- a/share/man/man4/ises.4
+++ b/share/man/man4/ises.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ises.4,v 1.5 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: ises.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Håkan Olsson (ho@crt.se)
 .\" All rights reserved.
@@ -44,10 +44,6 @@ The
 driver at the moment only provides strong random data to the
 .Xr random 4
 subsystem.
-.Sh BUGS
-The cryptographic functions are not yet supported.
-Also not yet supported are the chip's two LNAUs (Large Number Arithmetic
-Units), which would be useful in OpenSSL applications.
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr pci 4 ,
@@ -57,3 +53,7 @@ The
 .Nm
 device driver appeared in
 .Ox 2.9 .
+.Sh BUGS
+The cryptographic functions are not yet supported.
+Also not yet supported are the chip's two LNAUs (Large Number Arithmetic
+Units), which would be useful in OpenSSL applications.
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 438e01b5415..e480bb6d2d8 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isp.4,v 1.12 2002/11/08 08:08:47 mpech Exp $
+.\"	$OpenBSD: isp.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998, 1999
 .\" 	Matthew Jacob, for NASA/Ames Research Center
@@ -65,8 +65,6 @@ An optional
 ensures that known good firmware will be downloaded to the driver
 at attach time.
 This is recommended.
-.Sh BUGS
-None known at this time.
 .Sh SEE ALSO
 .Xr cd 4 ,
 .Xr ch 4 ,
@@ -83,3 +81,5 @@ None known at this time.
 The
 .Nm
 driver was written by Matthew Jacob for NASA/Ames Research Center.
+.Sh BUGS
+None known at this time.
diff --git a/share/man/man4/lc.4 b/share/man/man4/lc.4
index 25436125c32..f50b2efc929 100644
--- a/share/man/man4/lc.4
+++ b/share/man/man4/lc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lc.4,v 1.4 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: lc.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: lc.4,v 1.4 1999/12/15 22:07:32 abs Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@ This includes the DE203, DE204, and DE205.
 The EtherWORKS III series supports various combinations of media, depending
 on model.
 Some models also support media autoselect.
-Media is selected with 
+Media is selected with
 .Xr ifconfig 8 's
 .Sq media
 directive.
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 949ecebc93b..4ecabddfd87 100644
--- a/share/man/man4/lo.4
+++ b/share/man/man4/lo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lo.4,v 1.16 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: lo.4,v 1.17 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: lo.4,v 1.3 1994/11/30 16:22:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -67,16 +67,9 @@ by the address and netmask.
 Obviously you should not set the
 .Em link1
 flag on interface
-.Nm lo0 Ns ,
+.Nm lo0 ,
 but instead use another interface like
-.Nm lo1 Ns .
-.Sh DIAGNOSTICS
-.Bl -diag
-.It lo%d: can't handle af%d.
-The interface was handed
-a message with addresses formatted in an unsuitable address
-family; the packet was dropped.
-.El
+.Nm lo1 .
 .Sh EXAMPLES
 ifconfig lo1 inet 192.168.1.1 netmask 255.255.255.0 link1
 .Pp
@@ -84,6 +77,13 @@ is equivalent to:
 .Pp
 awk 'BEGIN {for(i=1;i<255;i++) \
 print "ifconfig lo1 inet 192.168.1."i" netmask 255.255.255.255 alias"}'|sh
+.Sh DIAGNOSTICS
+.Bl -diag
+.It lo%d: can't handle af%d.
+The interface was handed
+a message with addresses formatted in an unsuitable address
+family; the packet was dropped.
+.El
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr inet6 4 ,
diff --git a/share/man/man4/lxtphy.4 b/share/man/man4/lxtphy.4
index 6bdf7c6a0d1..88185260196 100644
--- a/share/man/man4/lxtphy.4
+++ b/share/man/man4/lxtphy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lxtphy.4,v 1.5 2001/12/15 02:41:47 deraadt Exp $
+.\"	$OpenBSD: lxtphy.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: lxtphy.4,v 1.1 1998/11/04 05:53:59 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver supports the Level One LXT-970, LXT-970A and LXT-971 10/100 Ethernet 
+driver supports the Level One LXT-970, LXT-970A and LXT-971 10/100 Ethernet
 PHYs.
 These PHYs are found on a variety of high-performance Ethernet interfaces.
 .Sh SEE ALSO
diff --git a/share/man/man4/man4.alpha/le.4 b/share/man/man4/man4.alpha/le.4
index 92134e122aa..506de73632a 100644
--- a/share/man/man4/man4.alpha/le.4
+++ b/share/man/man4/man4.alpha/le.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: le.4,v 1.6 2002/09/30 18:09:48 miod Exp $
+.\"     $OpenBSD: le.4,v 1.7 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
 .\" All rights reserved.
@@ -31,8 +31,6 @@ interface employs the address resolution protocol described in
 .Xr arp 4
 to dynamically map between Internet and Ethernet addresses on the local
 network.
-.Sh BUGS
-The PCI form of the Lance driver is untested.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ifmedia 4 ,
@@ -41,3 +39,5 @@ The PCI form of the Lance driver is untested.
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
+.Sh BUGS
+The PCI form of the Lance driver is untested.
diff --git a/share/man/man4/man4.alpha/tga.4 b/share/man/man4/man4.alpha/tga.4
index 6cab5183942..774672b1459 100644
--- a/share/man/man4/man4.alpha/tga.4
+++ b/share/man/man4/man4.alpha/tga.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tga.4,v 1.6 2003/06/04 18:31:14 nate Exp $
+.\" $OpenBSD: tga.4,v 1.7 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Nathan L. Binkert <binkertn@umich.edu>
 .\"
@@ -33,7 +33,7 @@ at runtime.
 On some TGA models, there are four dip switches.
 On other models, there is a rotary switch with positions 0-F.
 There are also some that use jumpers.
-.Ss TGA Switch Settings:
+.Ss TGA Switch Settings
 .Bl -column "Setting" "Pixel Freq" "Resolution" "Refresh Rate"
 .It Li Switch Ta Pixel Ta Monitor Ta Refresh
 .It Em "Setting	Freq (MHz)	Resolution	Rate (MHz)"
diff --git a/share/man/man4/man4.hp300/dcm.4 b/share/man/man4/man4.hp300/dcm.4
index b22db34a8db..7c4448d234a 100644
--- a/share/man/man4/man4.hp300/dcm.4
+++ b/share/man/man4/man4.hp300/dcm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dcm.4,v 1.12 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: dcm.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -93,8 +93,8 @@ overflowed.
 .El
 .Sh SEE ALSO
 .Xr apci 4 ,
-.Xr dio 4 ,
 .Xr dca 4 ,
+.Xr dio 4 ,
 .Xr intro 4 ,
 .Xr tty 4
 .Sh BUGS
diff --git a/share/man/man4/man4.hp300/hd.4 b/share/man/man4/man4.hp300/hd.4
index db70e1bef04..49cd6a6d4e6 100644
--- a/share/man/man4/man4.hp300/hd.4
+++ b/share/man/man4/man4.hp300/hd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hd.4,v 1.9 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: hd.4,v 1.10 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -60,7 +60,7 @@ The driver recognizes the following drives:
 7912, 7914, 7933, 7936, 7937, 7945,
 .Tn 757A/B ,
 .Tn 7958A/B ,
-.Tn 7959B,
+.Tn 7959B ,
 7962, 7963, 9122, 9134, 7912, 7936,
 and 9122,
 not all of which have been tested.
diff --git a/share/man/man4/man4.hp300/st.4 b/share/man/man4/man4.hp300/st.4
index 3ec681bded1..16c841980c6 100644
--- a/share/man/man4/man4.hp300/st.4
+++ b/share/man/man4/man4.hp300/st.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: st.4,v 1.14 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: st.4,v 1.15 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -194,7 +194,7 @@ or
 will not work
 .Pf ( Dq Li tar c
 is ok).
-One can only start writing at  1) beginning of tape, 2) on the
+One can only start writing at 1) beginning of tape, 2) on the
 end of what was last written, 3) "front" side of a regular (long) filemark.
 For example, you have a tape with 3 tar files.
 If you want to save the first file, but overwrite the second two files with
diff --git a/share/man/man4/man4.hp300/topcat.4 b/share/man/man4/man4.hp300/topcat.4
index bc97b50c7eb..ded046b6cac 100644
--- a/share/man/man4/man4.hp300/topcat.4
+++ b/share/man/man4/man4.hp300/topcat.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: topcat.4,v 1.3 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: topcat.4,v 1.4 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -107,7 +107,6 @@ series 300
 (Internal
 Terminal Emulator) defaults.
 The device can also be used as a graphics output device.
-.Pp
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr dvbox 4 ,
diff --git a/share/man/man4/man4.hppa/cpu.4tbl b/share/man/man4/man4.hppa/cpu.4tbl
index a75f08fc82d..5c28aa3795d 100644
--- a/share/man/man4/man4.hppa/cpu.4tbl
+++ b/share/man/man4/man4.hppa/cpu.4tbl
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cpu.4tbl,v 1.14 2003/06/02 21:39:56 mickey Exp $
+.\" $OpenBSD: cpu.4tbl,v 1.15 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved.
@@ -33,7 +33,6 @@
 .Sh SYNOPSIS
 .Cd "cpu*       at mainbus0 irq 31
 .Sh DESCRIPTION
-.Pp
 The following table lists the
 .Tn PA-RISC
 CPU types and their characteristics, such as TLB, maximum
@@ -74,7 +73,6 @@ CPU:PA:Clock:Caches:TLB:BTLB:Models
        :    :  :8192 L2:  : :C132L,C160L
 .TE
 .in -\n(dIu
-.Pp
 .Sh FLOATING-POINT COPROCESSOR
 The following table summarizes available floating-point coprocessor
 models for the 32-bit
@@ -101,9 +99,8 @@ PA-50 (Hitachi):
 PCXL:712/60/80/100
 .TE
 .in -\n(dIu
-.Pp
 .Sh SUPERSCALAR EXECUTION
-The following table summarizes the superscalar execution capabilities 
+The following table summarizes the superscalar execution capabilities
 of 32-bit
 .Tn PA-RISC
 processors.
@@ -162,8 +159,8 @@ sys:system control instructions
 .TE
 .in -\n(dIu
 .Pp
-For CPUs with two integer ALUs (7100LC, 7200, 7300LC), the following 
-table lists the instructions which are allowed to be executed 
+For CPUs with two integer ALUs (7100LC, 7200, 7300LC), the following
+table lists the instructions which are allowed to be executed
 concurrently:
 .Pp
 .in +\n(dIu
@@ -182,7 +179,7 @@ sys: never bundled
 .TE
 .in -\n(dIu
 .Pp
-ldst + ldst is also possible under certain circumstances, which is then 
+ldst + ldst is also possible under certain circumstances, which is then
 called "double word load/store".
 .Pp
 The following restrictions are placed upon the superscalar execution:
@@ -213,24 +210,20 @@ An instruction which might nullify its successor is never bundled with
 this successor. Only if the successor is a flop instruction is this bundle
 allowed.
 .El
-.Pp
 .Sh PERFORMANCE MONITOR COPROCESSOR
 The performance monitor coprocessor is an optional,
 implementation-dependent coprocessor which provides a minimal common
 software interface to implementation-dependent performance monitor hardware.
-.Pp
 .Sh DEBUG SPECIAL UNIT
 The debug special function unit is an optional,
 architected SFU which provides hardware assistance for software debugging
 using breakpoints.
 The debug SFU is currently defined only for Level 0 processors.
-.Pp
 .Sh SEE ALSO
 .Xr asp 4 ,
 .Xr intro 4 ,
 .Xr lasi 4 ,
 .Xr wax 4
-.Pp
 .Rs
 .%T PA-RISC 1.1 Architecture and Instruction Set Reference Manual
 .%A Hewlett-Packard
diff --git a/share/man/man4/man4.hppa/gsc.4 b/share/man/man4/man4.hppa/gsc.4
index 9fc0f3d5b0a..05ac73436c7 100644
--- a/share/man/man4/man4.hppa/gsc.4
+++ b/share/man/man4/man4.hppa/gsc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gsc.4,v 1.15 2003/06/02 21:39:56 mickey Exp $
+.\"	$OpenBSD: gsc.4,v 1.16 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1999 Michael Shalayeff
@@ -29,7 +29,7 @@
 .Os
 .Sh NAME
 .Nm gsc
-.Nd General System Connect bus on 
+.Nd General System Connect bus on
 .Tn HP 9000/700
 machines
 .Sh SYNOPSIS
@@ -59,8 +59,7 @@ mostly has only one VLSI chip on it (in most cases LASI/WAX).
 Newer systems sometimes feature the "HSC formfactor", which is a 1U-VME
 card-like expansion card with a 100-pin male pin+socket connector.
 Mixing cards with different speeds is supported but downgrades
-the performance of the whole I/O-subsystem. 
-.Pp
+the performance of the whole I/O-subsystem.
 .Sh SUPPORTED DEVICES
 The system includes machine-dependent
 .Tn GSC
@@ -82,14 +81,14 @@ Centronics printer port.
 SCSI I/O processor.
 .El
 .Pp
-Some of these 
+Some of these
 .Tn GSC
 devices also have
 .Tn PCI
 ,
-.Tn EISA 
+.Tn EISA
 or
-.Tn ISA 
+.Tn ISA
 equivalents.
 These are listed in
 .Xr pci 4 ,
diff --git a/share/man/man4/man4.hppa/gsckbd.4 b/share/man/man4/man4.hppa/gsckbd.4
index ed8ce4cebe9..e6a4ab1000b 100644
--- a/share/man/man4/man4.hppa/gsckbd.4
+++ b/share/man/man4/man4.hppa/gsckbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gsckbd.4,v 1.7 2003/05/27 15:42:43 mickey Exp $
+.\" $OpenBSD: gsckbd.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003, Miodrag Vallat.
 .\" All rights reserved.
@@ -232,7 +232,6 @@ to the kernel configuration file.
 .Xr wskbd 4 ,
 .Xr wsconsctl 8
 .Sh BUGS
-.Pp
 The list of built-in mappings doesn't follow any logic.
 It grew as people submitted what they needed.
 .Pp
diff --git a/share/man/man4/man4.hppa/ie.4 b/share/man/man4/man4.hppa/ie.4
index bab8d6b2ef0..3deef98ca9f 100644
--- a/share/man/man4/man4.hppa/ie.4
+++ b/share/man/man4/man4.hppa/ie.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ie.4,v 1.9 2003/06/02 21:39:56 mickey Exp $
+.\"	$OpenBSD: ie.4,v 1.10 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Paul Weissmann
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm ie
-.Nd Intel i82596 DX/CA LAN coprocessor as found in 
+.Nd Intel i82596 DX/CA LAN coprocessor as found in
 .Tn HP 9000/700
 machines
 .Sh SYNOPSIS
@@ -40,7 +40,7 @@ The
 .Nm
 interface provides access to the 10 Mb/s
 .Tn Ethernet
-network via the 
+network via the
 .Tn Intel
 i82596 DX/CA 32-bit
 Local Area Network Coprocessor for Ethernet.
@@ -67,9 +67,9 @@ the back.
 On the models with both you usually have to switch a big
 jumper-block on the mainboard to choose which one to activate.
 .It i82596CA
-Systems with LASI MBA, e.g. 712/*, 715/100 have the i82596CA 
+Systems with LASI MBA, e.g. 712/*, 715/100 have the i82596CA
 integrated on the LASI macrochip.
-They usually have TP and AUI 
+They usually have TP and AUI
 connectors and autodetect to which one the network is connected to.
 .El
 .Pp
@@ -94,9 +94,10 @@ Use the BNC connector
 .Xr intro 4 ,
 .Xr io 4
 .Rs
-"82596DX AND 82596SX High-Performance 32-bit Local Area Network Coprocessor"
-.br
-"82596CA High-Performance 32-bit Local Area Network Coprocessor"
-.br
-Intel
-
+.%T 82596DX AND 82596SX High-Performance 32-bit Local Area Network Coprocessor
+.%Q Intel
+.Re
+.Rs
+.%T 82596CA High-Performance 32-bit Local Area Network Coprocessor
+.%Q Intel
+.Re
diff --git a/share/man/man4/man4.hppa/intro.4tbl b/share/man/man4/man4.hppa/intro.4tbl
index aad93db39a1..afb05b46817 100644
--- a/share/man/man4/man4.hppa/intro.4tbl
+++ b/share/man/man4/man4.hppa/intro.4tbl
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.4tbl,v 1.12 2003/06/02 21:39:56 mickey Exp $
+.\" $OpenBSD: intro.4tbl,v 1.13 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002,2003 Paul Weissmann
 .\" All rights reserved.
@@ -193,7 +193,6 @@ C160L:160:7300LC:64/64(+1024):1 GSC/PCI, 1 GSC/PCI/EISA,
  : : : :2 GSC/EISA
 .TE
 .in -\n(dIu
-.Pp
 .Sh LIST OF DEVICES
 The devices listed below are supported in this incarnation of
 the system.  Devices are indicated by their functional interface.
@@ -215,7 +214,7 @@ CS4215/AD1849 audio.
 Human Interface Loop, sporting several input devices,
 e.g. keyboards, mice, tablets and such.
 .It Xr ie 4
-i82596 CA/DX LAN coprocessor. Found in every 700, either included in the MBA 
+i82596 CA/DX LAN coprocessor. Found in every 700, either included in the MBA
 or on an external chip on mainboard.
 .It Xr lasi 4
 LSI?, found in almost all
@@ -245,7 +244,7 @@ implementations for add-on devices.
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
-.Xr config 8 
+.Xr config 8
 .Sh HISTORY
 The
 hppa
diff --git a/share/man/man4/man4.hppa/lasi.4 b/share/man/man4/man4.hppa/lasi.4
index c3a300813dd..8629ac439ad 100644
--- a/share/man/man4/man4.hppa/lasi.4
+++ b/share/man/man4/man4.hppa/lasi.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lasi.4,v 1.16 2003/06/02 21:39:56 mickey Exp $
+.\"	$OpenBSD: lasi.4,v 1.17 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1999 Michael Shalayeff
@@ -72,7 +72,7 @@ Interface for the WD37C65C floppy drive controller
 Optional Telephone interface (voice/modem/fax two channels)
 .El
 .Sh MACHINES
-An incomplete list of machines that use the 
+An incomplete list of machines that use the
 .Tn LASI
 bus controller:
 .Pp
diff --git a/share/man/man4/man4.hppa/wax.4 b/share/man/man4/man4.hppa/wax.4
index 3e3760badab..a1a6e6d211e 100644
--- a/share/man/man4/man4.hppa/wax.4
+++ b/share/man/man4/man4.hppa/wax.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wax.4,v 1.3 2003/06/02 21:39:56 mickey Exp $
+.\"	$OpenBSD: wax.4,v 1.4 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 2003 Michael Shalayeff
@@ -39,13 +39,13 @@ The
 GSC bus controller is a version of
 .Xr lasi 4
 with limited functionality and no additional devices on the crystal.
-It is mainly used as a GSC bus controller for additional onboard devices 
+It is mainly used as a GSC bus controller for additional onboard devices
 (e.g. 2nd RS232 or HIL) and sometimes add-on cards (such as a TR-9000
 card for the
 .Tn HP 9000/712
 models).
 .Sh MACHINES
-An incomplete list of machines that use the 
+An incomplete list of machines that use the
 .Nm
 bus controller:
 .Pp
@@ -79,23 +79,22 @@ RDI PrecisionBook
 .Xr intro 4 ,
 .Xr io 4 ,
 .Xr lasi 4 ,
-.Xr phantomas 4 ,
-.Xr wax 4
+.Xr phantomas 4
 .Rs
-"Precision I/O Architecture Reference Specification"
-.br
-Hewlett-Packard
+.%T Precision I/O Architecture Reference Specification
+.%Q Hewlett-Packard
 .Re
 .Rs
-"712 I/O Subsystem ERS" Revision 1.1, 12 February 1993
-.br
-Hewlett-Packard, Dwg No.
-A-A2263-66510-31
+.%T 712 I/O Subsystem ERS
+.%N Revision 1.1
+.%D 12 February 1993
+.%Q Hewlett-Packard
+.%V Dwg No. A-A2263-66510-31
 .Re
 .Rs
-Hewlett-Packard Journal
-.br
-April 1995 Volume 46 Number 2
+.%Q Hewlett-Packard Journal
+.%D April 1995
+.%V Volume 46 Number 2
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/man4.i386/bios.4 b/share/man/man4/man4.i386/bios.4
index 2fa2c2be522..fcd4881c7e0 100644
--- a/share/man/man4/man4.i386/bios.4
+++ b/share/man/man4/man4.i386/bios.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bios.4,v 1.8 2003/06/03 21:02:47 mickey Exp $
+.\"	$OpenBSD: bios.4,v 1.9 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Michael Shalayeff
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .Cd "bios0    at mainbus0 flags 0x0000"
 .Cd "apm0     at bios0 flags 0x0000"
 .Cd "pcibios0 at bios0 flags 0x0000"
-.Sh INTRODUCTION
+.Sh DESCRIPTION
 .Ox
 provides support for PC firmware, aka BIOS and some of its functions,
 currently: APM subsystem, BIOS 32 extensions, PCI BIOS subsystem.
diff --git a/share/man/man4/man4.i386/lms.4 b/share/man/man4/man4.i386/lms.4
index a6fde5ad743..e5a8a947cb5 100644
--- a/share/man/man4/man4.i386/lms.4
+++ b/share/man/man4/man4.i386/lms.4
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: lms.4,v 1.7 2002/10/01 07:14:14 miod Exp $
+.\"	$OpenBSD: lms.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\" $NetBSD: lms.4,v 1.13 2000/07/05 16:13:48 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\"          information about NetBSD.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -30,7 +30,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
 .Dd March 12, 1997
diff --git a/share/man/man4/man4.i386/mem.4 b/share/man/man4/man4.i386/mem.4
index bf7d118a813..efcfb948963 100644
--- a/share/man/man4/man4.i386/mem.4
+++ b/share/man/man4/man4.i386/mem.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mem.4,v 1.7 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: mem.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -56,7 +56,7 @@ Only kernel virtual addresses that are currently mapped to memory are allowed.
 On ISA the I/O memory space begins at physical address
 .Li 0x000a0000
 and runs to
-.Li 0x00100000.
+.Li 0x00100000 .
 The per-process data size for the current process is
 .Dv UPAGES
 long, and ends at virtual address
diff --git a/share/man/man4/man4.i386/mms.4 b/share/man/man4/man4.i386/mms.4
index 1a11ec4dc53..e842901e8fa 100644
--- a/share/man/man4/man4.i386/mms.4
+++ b/share/man/man4/man4.i386/mms.4
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: mms.4,v 1.6 2002/10/01 07:14:14 miod Exp $
+.\"	$OpenBSD: mms.4,v 1.7 2003/06/06 10:29:42 jmc Exp $
 .\" $NetBSD: mms.4,v 1.13 2000/07/05 16:13:49 msaitoh Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\"          information about NetBSD.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -30,7 +30,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" 
+.\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
 .Dd March 12, 1997
diff --git a/share/man/man4/man4.i386/pcibios.4 b/share/man/man4/man4.i386/pcibios.4
index ca9fd4ad196..558f61b8f3d 100644
--- a/share/man/man4/man4.i386/pcibios.4
+++ b/share/man/man4/man4.i386/pcibios.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pcibios.4,v 1.16 2003/03/17 10:06:07 jmc Exp $
+.\" $OpenBSD: pcibios.4,v 1.17 2003/06/06 10:29:42 jmc Exp $
 .\" $NetBSD: pcibios.4,v 1.7 2000/08/03 13:32:39 soda Exp $
 .\"
 .\" Copyright (c) 2000 Michael Shalayeff, All rights reserved.
@@ -46,7 +46,7 @@
 .Cd "pcibios0 at bios0 flags 0x0000"
 .\" .Cd "#option  PCIBIOS_IRQS_HINT=0x0a00 #IRQ 9,11"
 .\" .Cd "#option  PCIBIOS_INTR_FIXUP_FORCE"
-.Sh INTRODUCTION
+.Sh DESCRIPTION
 .Ox
 provides support for setting up PCI controllers, bridges, and devices
 using information extracted from the BIOS.
diff --git a/share/man/man4/man4.i386/pctr.4 b/share/man/man4/man4.i386/pctr.4
index 66fe7095da8..04d07a2802f 100644
--- a/share/man/man4/man4.i386/pctr.4
+++ b/share/man/man4/man4.i386/pctr.4
@@ -1,11 +1,11 @@
-.\"	$OpenBSD: pctr.4,v 1.18 2003/05/05 13:51:58 jmc Exp $
+.\"	$OpenBSD: pctr.4,v 1.19 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Pentium performance counter driver for OpenBSD.
 .\" Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
 .\"
 .\" Modification and redistribution in source and binary forms is
 .\" permitted provided that due credit is given to the author and the
-.\" OpenBSD project by leaving this copyright notice intact. 
+.\" OpenBSD project by leaving this copyright notice intact.
 .\"
 .Dd August 15, 1996
 .Dt PCTR 4 i386
@@ -472,6 +472,10 @@ invocations of
 .Fn rdpmc
 and/or
 .Fn rdtsc .
+.Sh FILES
+.Bl -tag -width /dev/pctr -compact
+.It Pa /dev/pctr
+.El
 .Sh ERRORS
 .Bl -tag -width "[ENODEV]"
 .It Bq Er ENODEV
@@ -487,10 +491,6 @@ or
 An attempt was made to set the counter functions, but the device was
 not open for writing.
 .El
-.Sh FILES
-.Bl -tag -width /dev/pctr -compact
-.It Pa /dev/pctr
-.El
 .Sh SEE ALSO
 .Xr pctr 1 ,
 .Xr ioctl 2
diff --git a/share/man/man4/man4.i386/speaker.4 b/share/man/man4/man4.i386/speaker.4
index 5091f8cb8b8..61860f20327 100644
--- a/share/man/man4/man4.i386/speaker.4
+++ b/share/man/man4/man4.i386/speaker.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: speaker.4,v 1.13 2002/10/01 07:14:14 miod Exp $
+.\"	$OpenBSD: speaker.4,v 1.14 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: speaker.4,v 1.9 1998/08/18 08:16:56 augustss Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,13 +33,13 @@
 .Dt SPEAKER 4 i386
 .Os
 .Sh NAME
-.Nm speaker 
+.Nm speaker
 .Nd console speaker device driver
 .Sh SYNOPSIS
 .Cd "spkr0	at pcppi?"
 .Sh DESCRIPTION
 The
-.Nm 
+.Nm
 device driver allows applications to control the PC console
 speaker on an IBM-PC-compatible machine running UNIX.
 .Pp
@@ -215,7 +215,7 @@ melody sections.
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
-.Xr pcppi 4 .
+.Xr pcppi 4
 .Sh AUTHORS
 .An Eric S. Raymond Aq esr@snark.thyrsus.com ,
 Feb 1990
diff --git a/share/man/man4/man4.i386/wss.4 b/share/man/man4/man4.i386/wss.4
index 7f93014d5be..5048eb748d1 100644
--- a/share/man/man4/man4.i386/wss.4
+++ b/share/man/man4/man4.i386/wss.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: wss.4,v 1.10 2002/10/01 07:14:14 miod Exp $
+.\"   $OpenBSD: wss.4,v 1.11 2003/06/06 10:29:42 jmc Exp $
 .\"   $NetBSD: wss.4,v 1.8 1998/01/19 20:22:30 augustss Exp $
 .\"
 .\" Copyright (c) 1995 Michael Long.
@@ -57,10 +57,10 @@ MAD16 because it requires use of extra I/O ports not in the base port range.
 Bit 2 in
 .Cm flags
 disables the joystick port on MAD16 hardware.
-.Sh BUGS
-The FM synthesizer is not supported.
 .Sh SEE ALSO
 .Xr audio 4 ,
 .Xr intro 4 ,
 .Xr isa 4 ,
 .Xr isapnp 4
+.Sh BUGS
+The FM synthesizer is not supported.
diff --git a/share/man/man4/man4.mac68k/adb.4 b/share/man/man4/man4.mac68k/adb.4
index c4a0565a367..3ae3b44b410 100644
--- a/share/man/man4/man4.mac68k/adb.4
+++ b/share/man/man4/man4.mac68k/adb.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: adb.4,v 1.7 2002/10/01 20:58:12 miod Exp $
+.\"	$OpenBSD: adb.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
 .\"
 .Dd July 17, 1997
@@ -177,6 +177,13 @@ Microspeed Mouse Deluxe
 Mouse Systems A3 Mouse
 .El
 .Ed
+.Sh FILES
+.Bl -tag -width /dev/adb -compact
+.It Pa /dev/adb
+The
+.Tn ADB
+event device.
+.El
 .Sh DIAGNOSTICS
 .Bl -diag -compact
 .It adb0 at obio0 (ADB event device).
@@ -236,13 +243,6 @@ The size of the
 event being read is too large to fit into the buffer
 allocated to it.
 .El
-.Sh FILES
-.Bl -tag -width /dev/adb -compact
-.It Pa /dev/adb
-The
-.Tn ADB
-event device.
-.El
 .Sh SEE ALSO
 .Xr intro 4
 .Sh HISTORY
diff --git a/share/man/man4/man4.mac68k/intro.4 b/share/man/man4/man4.mac68k/intro.4
index ab600402bd6..2bac924cfd5 100644
--- a/share/man/man4/man4.mac68k/intro.4
+++ b/share/man/man4/man4.mac68k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.12 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: intro.4,v 1.13 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: intro.4,v 1.4 1997/03/28 00:29:35 veego Exp $
 .\"
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
@@ -37,7 +37,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.mac68k/obio.4 b/share/man/man4/man4.mac68k/obio.4
index bbb9b015e2a..9c2d30c997e 100644
--- a/share/man/man4/man4.mac68k/obio.4
+++ b/share/man/man4/man4.mac68k/obio.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: obio.4,v 1.6 2003/03/22 08:07:12 david Exp $
+.\"	$OpenBSD: obio.4,v 1.7 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: obio.4,v 1.1 1997/07/18 02:13:40 ender Exp $
 .\"
 .Dd July 2, 1997
@@ -53,7 +53,7 @@ onboard I/O bus.
 .\" .Xr asc 4 ,
 .\" .Xr esp 4 ,
 .Xr intro 4 ,
-.Xr mainbus 4
+.Xr mainbus 4 ,
 .Xr mc 4 ,
 .\" .Xr ncrscsi 4
 .\" .Xr sbc 4
diff --git a/share/man/man4/man4.macppc/adb.4 b/share/man/man4/man4.macppc/adb.4
index b1a0170305b..2f654d323e5 100644
--- a/share/man/man4/man4.macppc/adb.4
+++ b/share/man/man4/man4.macppc/adb.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: adb.4,v 1.5 2002/10/01 20:59:48 miod Exp $
+.\" $OpenBSD: adb.4,v 1.6 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" Copyright (c) 1997 Colin Wood
@@ -32,7 +32,7 @@
 .\"
 .Dd July 30, 2001
 .Dt ADB 4 macppc
-.Os 
+.Os
 .Sh NAME
 .Nm adb
 .Nd Apple Desktop Bus driver
@@ -51,10 +51,10 @@ interface used by Macintosh computers to connect input devices
 such as keyboards, mice, trackballs, and graphics tablets
 to the machine.
 .Pp
-Originally developed for the Mac68K port, the 
+Originally developed for the Mac68K port, the
 .Nm
-driver was heavily modified when it was ported to the PowerPC architecture.  
-During this port it seems that the original 
+driver was heavily modified when it was ported to the PowerPC architecture.
+During this port it seems that the original
 .Nm
 event device was split into many smaller subsystems, namely:
 .Pp
@@ -65,7 +65,7 @@ Apple Event Device driver
 .It
 Apple Keyboard driver
 .Pq Xr akbd 4 .
-.It 
+.It
 Apple Mouse Support driver
 .Pq Xr ams 4 .
 .El
@@ -73,7 +73,7 @@ Apple Mouse Support driver
 New
 .Nm
 devices such as the Apple Brightness / Volume Control Button
-.Pq Xr abtn 4 
+.Pq Xr abtn 4
 and some energy control
 .Pq Xr apm 4
 were added to the PowerPC port later to complement the ADB system.
@@ -91,9 +91,9 @@ interface first appeared in
 .Nx 0.9 .
 It has been under development ever since.
 The original
-.Xr adb 4
-manpage was written by Colin Wood for 
-.Nx 
+.Nm adb
+manpage was written by Colin Wood for
+.Nx
 / Mac68K.
 .Sh AUTHORS
 Original ADB support was written by Bradley A. Grantham.
diff --git a/share/man/man4/man4.macppc/aed.4 b/share/man/man4/man4.macppc/aed.4
index 8b270a58a8e..f58dedfc8e9 100644
--- a/share/man/man4/man4.macppc/aed.4
+++ b/share/man/man4/man4.macppc/aed.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aed.4,v 1.4 2002/10/01 20:59:48 miod Exp $
+.\" $OpenBSD: aed.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -27,23 +27,23 @@
 .\"
 .Dd July 30, 2001
 .Dt AED 4 macppc
-.Os 
+.Os
 .Sh NAME
 .Nm aed
 .Nd Apple Event Device
 .Sh SYNOPSIS
 .Cd "aed* at adb?"
 .Sh DESCRIPTION
-The 
+The
 .Nm
-driver handles events on the 
-.Xr adb 4 
+driver handles events on the
+.Xr adb 4
 Desktop Bus.
 .Sh SEE ALSO
 .Xr adb 4 ,
 .Xr intro 4
 .Sh AUTHORS
-The 
+The
 .Nm
 driver was written by
-.Sy Bradley A. Grantham.
+.Sy Bradley A. Grantham .
diff --git a/share/man/man4/man4.macppc/ams.4 b/share/man/man4/man4.macppc/ams.4
index d0d480329b8..019525c4f62 100644
--- a/share/man/man4/man4.macppc/ams.4
+++ b/share/man/man4/man4.macppc/ams.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ams.4,v 1.4 2002/10/01 20:59:48 miod Exp $
+.\" $OpenBSD: ams.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .Dd July 30, 2001
 .Dt AMS 4 macppc
-.Os 
+.Os
 .Sh NAME
 .Nm ams
 .Nd Apple Mouse Support
@@ -35,9 +35,9 @@
 .Cd "ams* at adb?"
 .Cd "wsmouse at ams? mux 0"
 .Sh DESCRIPTION
-The 
-.Nm 
-driver supports a series of 
+The
+.Nm
+driver supports a series of
 .Xr adb 4
 mice, trackballs, trackpads and tablets.
 .Pp
@@ -63,7 +63,7 @@ TrackMan trackball
 .Xr ums 4 ,
 .Xr wsmouse 4
 .Sh AUTHORS
-The 
+The
 .Nm
 driver was written by
-.Sy Colin Wood.
+.Sy Colin Wood .
diff --git a/share/man/man4/man4.macppc/bm.4 b/share/man/man4/man4.macppc/bm.4
index 58eee71857b..01b89de8630 100644
--- a/share/man/man4/man4.macppc/bm.4
+++ b/share/man/man4/man4.macppc/bm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bm.4,v 1.4 2002/10/01 20:59:48 miod Exp $
+.\" $OpenBSD: bm.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -27,14 +27,14 @@
 .\"
 .Dd July 30, 2001
 .Dt BM 4 macppc
-.Os 
+.Os
 .Sh NAME
 .Nm bm
 .Nd Apple BMAC Ethernet driver
 .Sh SYNOPSIS
 .Cd "bm* at macobio?"
 .Sh DESCRIPTION
-The 
+The
 .Nm
 device driver supports Apple BMAC and compatible Ethernet devices.
 .Sh SEE ALSO
diff --git a/share/man/man4/man4.macppc/intro.4 b/share/man/man4/man4.macppc/intro.4
index 32d4b661cac..43e1e6e5758 100644
--- a/share/man/man4/man4.macppc/intro.4
+++ b/share/man/man4/man4.macppc/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.15 2003/06/02 18:35:57 pvalchev Exp $
+.\"	$OpenBSD: intro.4,v 1.16 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Peter Valchev.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.macppc/zs.4 b/share/man/man4/man4.macppc/zs.4
index d524344e722..63979947e17 100644
--- a/share/man/man4/man4.macppc/zs.4
+++ b/share/man/man4/man4.macppc/zs.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zs.4,v 1.4 2003/03/06 04:03:40 david Exp $
+.\"	$OpenBSD: zs.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
 .\" All rights reserved.
@@ -40,14 +40,6 @@ only the DTR and RTS signals can be modified with TIOCMSET, TIOCMBIC,
 and TIOCMBIS
 .Xr ioctl 2
 commands.
-.Sh BUGS
-The
-.Nm
-driver now supports cua minor devices, but with this known deficiency
-in the simultaneous outgoing/incoming aspect of the driver:
-The first outgoing connection succeeds, but second and subsequent
-connections fail, apparently due to a getty hang.
-The hung getty apparently prevents the cua device from being re-opened.
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /dev/tty00
@@ -68,3 +60,11 @@ Support for the TIOCM*
 .Xr ioctl 2 Ns s
 appeared in
 .Ox 2.3 .
+.Sh BUGS
+The
+.Nm
+driver now supports cua minor devices, but with this known deficiency
+in the simultaneous outgoing/incoming aspect of the driver:
+The first outgoing connection succeeds, but second and subsequent
+connections fail, apparently due to a getty hang.
+The hung getty apparently prevents the cua device from being re-opened.
diff --git a/share/man/man4/man4.mvme68k/intro.4 b/share/man/man4/man4.mvme68k/intro.4
index 862c8cd69db..a0a2ca3a17a 100644
--- a/share/man/man4/man4.mvme68k/intro.4
+++ b/share/man/man4/man4.mvme68k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.15 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: intro.4,v 1.16 2003/06/06 10:29:42 jmc Exp $
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.mvme68k/le.4 b/share/man/man4/man4.mvme68k/le.4
index bb413c1b77c..e80b12174e0 100644
--- a/share/man/man4/man4.mvme68k/le.4
+++ b/share/man/man4/man4.mvme68k/le.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: le.4,v 1.9 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: le.4,v 1.10 2003/06/06 10:29:42 jmc Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -73,11 +73,6 @@ MVME147 onboard ethernet interface
 .It Em MVME376
 MVME376 VMEbus ethernet card
 .El
-.Sh HISTORY
-The mvme68k
-.Nm
-interface first appeared in
-.Ox 2.0
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ie 4 ,
@@ -86,3 +81,8 @@ interface first appeared in
 .Xr netintro 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
+.Sh HISTORY
+The mvme68k
+.Nm
+interface first appeared in
+.Ox 2.0
diff --git a/share/man/man4/man4.mvme68k/ssh.4 b/share/man/man4/man4.mvme68k/ssh.4
index bacf21d4372..33922323bab 100644
--- a/share/man/man4/man4.mvme68k/ssh.4
+++ b/share/man/man4/man4.mvme68k/ssh.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh.4,v 1.2 2002/10/01 21:01:35 miod Exp $
+.\"	$OpenBSD: ssh.4,v 1.3 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: siop.4,v 1.3 2000/10/23 16:38:10 bouyer Exp $
 .\"
 .\" Copyright (c) 2000 Manuel Bouyer.
@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/share/man/man4/man4.sparc/daadio.4 b/share/man/man4/man4.sparc/daadio.4
index 2b7717ce8f9..dacfbbbb186 100644
--- a/share/man/man4/man4.sparc/daadio.4
+++ b/share/man/man4/man4.sparc/daadio.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: daadio.4,v 1.6 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: daadio.4,v 1.7 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .Sh NAME
 .Nm daadio
 .Nd MATRIX MD-DAADIO digital/analog, analog/digital, parallel i/o board
-.Sh SYNOPSISA
+.Sh SYNOPSIS
 .Cd "daadio* at fvme? addr 0x0 level 1 vect 0x1f"
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/man4.sparc/intro.4 b/share/man/man4/man4.sparc/intro.4
index d330f59124f..543e3558dc2 100644
--- a/share/man/man4/man4.sparc/intro.4
+++ b/share/man/man4/man4.sparc/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.34 2003/05/14 06:48:14 miod Exp $
+.\"     $OpenBSD: intro.4,v 1.35 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: intro.4,v 1.5 1998/02/06 06:07:00 perry Exp $
 .\"
 .\" Copyright (c) 1996 Jonathan Stone.
@@ -37,7 +37,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.sparc/magma.4 b/share/man/man4/man4.sparc/magma.4
index 7a91d240bd7..06281e8914c 100644
--- a/share/man/man4/man4.sparc/magma.4
+++ b/share/man/man4/man4.sparc/magma.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: magma.4,v 1.10 2003/05/07 08:13:20 jmc Exp $
+.\"	$OpenBSD: magma.4,v 1.11 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1998 Iain Hibbert
@@ -65,6 +65,13 @@ Up to four cards are supported in the system.
 .Pp
 All tty ports have full automatic hardware (RTS/CTS) flow control available
 and a 12 byte FIFO on the chip in each direction so errors should be minimal.
+.Sh FILES
+.Bl -tag -width /dev/bpp[0-3][0-1] -compact
+.It /dev/tty[0-3][0-a]
+Serial ports
+.It /dev/bpp[0-3][0-1]
+Parallel ports
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "mtty%d%x: ring buffer overflow"
@@ -72,35 +79,30 @@ Incoming characters have been discarded due to a buffer overflow.
 This is caused by the process in control of the device not reading characters
 fast enough.
 If need be you can make the ring buffer bigger by changing the
-\fIMAGMA_RBUF_SIZE\fR #define to something bigger, but it should be a multiple
-of two.
+.Dv MAGMA_RBUF_SIZE
+#define to something bigger, but it should be a multiple of two.
 .It "mtty%d%x: fifo overflow"
 Incoming characters have been discarded due to a CD1400 channel overrun.
 This is caused by interrupts not being serviced sufficiently quickly to prevent
 the 12 byte receive FIFO on a serial channel from overflowing.
-Reducing the value of either the \fIMTTY_RX_FIFO_THRESHOLD\fR or
-\fIMTTY_RX_DTR_THRESHOLD\fR #define's to something smaller may help slow
-machines avoid this problem.
-.El
-.Sh FILES
-.Bl -tag -width /dev/bpp[0-3][0-1] -compact
-.It /dev/tty[0-3][0-a]
-Serial ports
-.It /dev/bpp[0-3][0-1]
-Parallel ports
+Reducing the value of either the
+.Dv MTTY_RX_FIFO_THRESHOLD
+or
+.Dv MTTY_RX_DTR_THRESHOLD
+#define's to something smaller may help slow machines avoid this problem.
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr sbus 4 ,
 .Xr tty 4
-.Sh AUTHORS
-The driver was written by
-.An Iain Hibbert Aq plunky@skate.demon.co.uk
 .Sh HISTORY
 The driver was loosely based upon the
 .Xr cy 4
 Cyclades Cyclom device driver written
 by Andrew Herbert and Timo Rossi.
+.Sh AUTHORS
+The driver was written by
+.An Iain Hibbert Aq plunky@skate.demon.co.uk
 .Sh TODO
 CD1190 parallel support.
 .Pp
diff --git a/share/man/man4/man4.sparc/spif.4 b/share/man/man4/man4.sparc/spif.4
index 3af4c370d2e..6b3c5a1d0c5 100644
--- a/share/man/man4/man4.sparc/spif.4
+++ b/share/man/man4/man4.sparc/spif.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: spif.4,v 1.10 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: spif.4,v 1.11 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -66,6 +66,13 @@ Up to four cards are supported in the system.
 .Pp
 Each of the serial ports has an 8 byte FIFO for receive and transmit as
 well as automatic hardware (RTS/CTS) flow control.
+.Sh FILES
+.Bl -tag -width /dev/tty[jkl][0-7] -compact
+.It /dev/tty[jkl][0-7]
+Serial ports
+.It /dev/sbpp[0-3]
+Parallel ports
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "spif%d: ccr timeout"
@@ -74,29 +81,22 @@ A timeout occurred while writing to one of the CD180 registers.
 Incoming characters were discarded because the application
 in control of the device did not read the input fast enough.
 .El
-.Sh FILES
-.Bl -tag -width /dev/tty[jkl][0-7] -compact
-.It /dev/tty[jkl][0-7]
-Serial ports
-.It /dev/sbpp[0-3]
-Parallel ports
-.El
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr sbus 4 ,
 .Xr tty 4
+.Sh HISTORY
+The
+.Nm spif
+driver was first supported in
+.Ox 2.5 .
 .Sh AUTHORS
 The driver was written by
 .An Jason Wright Aq jason@thought.net ,
 and is heavily based on the
 .Xr magma 4
 driver written by
-.An Iain Hibbert Ar plunky@skate.demon.co.uk .
-.Sh HISTORY
-The
-.Nm spif
-driver was first supported in
-.Ox 2.5 .
+.An Iain Hibbert Aq plunky@skate.demon.co.uk .
 .Sh TODO
 The parallel port is not supported yet.
 .Pp
diff --git a/share/man/man4/man4.sparc/zx.4 b/share/man/man4/man4.sparc/zx.4
index e07568dbd91..0798b4072c8 100644
--- a/share/man/man4/man4.sparc/zx.4
+++ b/share/man/man4/man4.sparc/zx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zx.4,v 1.6 2003/05/14 06:48:14 miod Exp $
+.\"	$OpenBSD: zx.4,v 1.7 2003/06/06 10:29:42 jmc Exp $
 .\" Copyright (c) 2003 Miodrag Vallat.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -107,7 +107,7 @@ The selected resolutions are:
 .Xr tvtwo 4 ,
 .Xr vigra 4 ,
 .Xr wscons 4 ,
-.Xr wsdisplay 4
+.Xr wsdisplay 4 ,
 .Xr boot_config 8 ,
 .Xr config 8
 .Sh CAVEATS
diff --git a/share/man/man4/man4.sparc64/apio.4 b/share/man/man4/man4.sparc64/apio.4
index 2dff4611ca5..0353860c78a 100644
--- a/share/man/man4/man4.sparc64/apio.4
+++ b/share/man/man4/man4.sparc64/apio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apio.4,v 1.4 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: apio.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -47,15 +47,15 @@ glue logic.
 .Xr intro 4 ,
 .Xr lpt 4 ,
 .Xr sbus 4
-.Sh AUTHORS
-The driver was written by
-.An Jason Wright Aq jason@thought.net .
 .Sh HISTORY
 .Ox
 support for
 .Nm
 was added in
 .Ox 3.1 .
+.Sh AUTHORS
+The driver was written by
+.An Jason Wright Aq jason@thought.net .
 .Sh BUGS
 Only revision
 .Tn 210sj
diff --git a/share/man/man4/man4.sparc64/asio.4 b/share/man/man4/man4.sparc64/asio.4
index 18f5673d0e9..382358fd16c 100644
--- a/share/man/man4/man4.sparc64/asio.4
+++ b/share/man/man4/man4.sparc64/asio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: asio.4,v 1.4 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: asio.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -47,15 +47,15 @@ glue logic.
 .Xr com 4 ,
 .Xr intro 4 ,
 .Xr sbus 4
-.Sh AUTHORS
-The driver was written by
-.An Jason Wright Aq jason@thought.net .
 .Sh HISTORY
 .Ox
 support for
 .Nm
 was added in
 .Ox 3.1 .
+.Sh AUTHORS
+The driver was written by
+.An Jason Wright Aq jason@thought.net .
 .Sh BUGS
 Only revision
 .Tn 210sj
diff --git a/share/man/man4/man4.sparc64/be.4 b/share/man/man4/man4.sparc64/be.4
index 173fd62cc59..14bc98280fa 100644
--- a/share/man/man4/man4.sparc64/be.4
+++ b/share/man/man4/man4.sparc64/be.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: be.4,v 1.4 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: be.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -68,8 +68,8 @@ Use 10Mbps, half duplex
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr ifmedia 4 ,
 .Xr hme 4 ,
+.Xr ifmedia 4 ,
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr le 4 ,
diff --git a/share/man/man4/man4.sparc64/comkbd.4 b/share/man/man4/man4.sparc64/comkbd.4
index 98964644624..1718a6b2166 100644
--- a/share/man/man4/man4.sparc64/comkbd.4
+++ b/share/man/man4/man4.sparc64/comkbd.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: comkbd.4,v 1.4 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: comkbd.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -47,11 +47,11 @@ driver).
 .Xr ebus 4 ,
 .Xr intro 4 ,
 .Xr wskbd 4
-.Sh AUTHORS
-The driver was written by
-.An Jason Wright Aq jason@thought.net .
 .Sh HISTORY
 The
 .Nm
 driver was first supported in
 .Ox 3.1 .
+.Sh AUTHORS
+The driver was written by
+.An Jason Wright Aq jason@thought.net .
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index d67b9f7ba4c..7fa96f7588e 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: creator.4,v 1.13 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: creator.4,v 1.14 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -50,10 +50,10 @@ available via the internal
 interface.
 .Pp
 By default hardware acceleration is used to erase the screen and
-scroll text.  
-By setting 
+scroll text.
+By setting
 .Ar flags
-to 
+to
 .Ar 1
 (via
 .Xr config 8
diff --git a/share/man/man4/man4.sparc64/intro.4 b/share/man/man4/man4.sparc64/intro.4
index 5f7c85e6623..4811ca6ba8b 100644
--- a/share/man/man4/man4.sparc64/intro.4
+++ b/share/man/man4/man4.sparc64/intro.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: intro.4,v 1.27 2003/05/02 00:09:45 jason Exp $
+.\"     $OpenBSD: intro.4,v 1.28 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001-2002 The OpenBSD Project
 .\" All Rights Reserved.
@@ -10,7 +10,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.sparc64/magma.4 b/share/man/man4/man4.sparc64/magma.4
index 9b85e92bdfe..fbdce401552 100644
--- a/share/man/man4/man4.sparc64/magma.4
+++ b/share/man/man4/man4.sparc64/magma.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: magma.4,v 1.6 2003/05/07 08:13:20 jmc Exp $
+.\"	$OpenBSD: magma.4,v 1.7 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1998 Iain Hibbert
@@ -65,6 +65,13 @@ Up to four cards are supported in the system.
 .Pp
 All tty ports have full automatic hardware (RTS/CTS) flow control available
 and a 12 byte FIFO on the chip in each direction so errors should be minimal.
+.Sh FILES
+.Bl -tag -width /dev/bpp[0-3][0-1] -compact
+.It /dev/tty[mno][0-f]
+Serial ports
+.It /dev/bpp[mno][0-1]
+Parallel ports
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "mtty%d%x: ring buffer overflow"
@@ -72,35 +79,30 @@ Incoming characters have been discarded due to a buffer overflow.
 This is caused by the process in control of the device not reading characters
 fast enough.
 If need be you can make the ring buffer bigger by changing the
-\fIMAGMA_RBUF_SIZE\fR #define to something bigger, but it should be a multiple
-of two.
+.Dv MAGMA_RBUF_SIZE
+#define to something bigger, but it should be a multiple of two.
 .It "mtty%d%x: fifo overflow"
 Incoming characters have been discarded due to a CD1400 channel overrun.
 This is caused by interrupts not being serviced sufficiently quickly to prevent
 the 12 byte receive FIFO on a serial channel from overflowing.
-Reducing the value of either the \fIMTTY_RX_FIFO_THRESHOLD\fR or
-\fIMTTY_RX_DTR_THRESHOLD\fR #define's to something smaller may help slow
-machines avoid this problem.
-.El
-.Sh FILES
-.Bl -tag -width /dev/bpp[0-3][0-1] -compact
-.It /dev/tty[mno][0-f]
-Serial ports
-.It /dev/bpp[mno][0-1]
-Parallel ports
+Reducing the value of either the
+.Dv MTTY_RX_FIFO_THRESHOLD
+or
+.Dv MTTY_RX_DTR_THRESHOLD
+#define's to something smaller may help slow machines avoid this problem.
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr sbus 4 ,
 .Xr tty 4
-.Sh AUTHORS
-The driver was written by
-.An Iain Hibbert Aq plunky@skate.demon.co.uk
 .Sh HISTORY
 The driver was loosely based upon the
 .Xr cy 4
 Cyclades Cyclom device driver written
 by Andrew Herbert and Timo Rossi.
+.Sh AUTHORS
+The driver was written by
+.An Iain Hibbert Aq plunky@skate.demon.co.uk
 .Sh TODO
 CD1190 parallel support.
 .Pp
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index 3de3f3b3021..d41dab8f7b1 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: openprom.4,v 1.7 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: openprom.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -141,13 +141,13 @@ exceeds the maximum allowed length (8191 bytes).
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr eeprom 8
-.Sh BUGS
-Due to limitations within the OPENPROM itself,
-these functions run at elevated priority
-and may adversely affect system performance.
 .Sh HISTORY
 A
 sparc64
 .Nm openprom
 manual page first appeared in
 .Ox 3.0 .
+.Sh BUGS
+Due to limitations within the OPENPROM itself,
+these functions run at elevated priority
+and may adversely affect system performance.
diff --git a/share/man/man4/man4.sparc64/sab.4 b/share/man/man4/man4.sparc64/sab.4
index 1fafb7bdd97..c24674b3de7 100644
--- a/share/man/man4/man4.sparc64/sab.4
+++ b/share/man/man4/man4.sparc64/sab.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sab.4,v 1.5 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: sab.4,v 1.6 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -58,10 +58,6 @@ only the DTR and RTS signals can be modified with TIOCMSET, TIOCMBIC,
 and TIOCMBIS
 .Xr ioctl 2
 commands.
-.Sh BUGS
-The
-.Nm
-does not support cua minor devices.
 .Sh FILES
 .Bl -tag -width /dev/ttyh[0-1] -compact
 .It /dev/ttyh[0-1]
@@ -77,3 +73,7 @@ The
 .Nm
 driver first appeared in
 .Ox 3.1 .
+.Sh BUGS
+The
+.Nm
+does not support cua minor devices.
diff --git a/share/man/man4/man4.sparc64/spif.4 b/share/man/man4/man4.sparc64/spif.4
index 3b4ca74bc45..1fe82349144 100644
--- a/share/man/man4/man4.sparc64/spif.4
+++ b/share/man/man4/man4.sparc64/spif.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: spif.4,v 1.8 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: spif.4,v 1.9 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -66,6 +66,13 @@ Up to four cards are supported in the system.
 .Pp
 Each of the serial ports has an 8 byte FIFO for receive and transmit as
 well as automatic hardware (RTS/CTS) flow control.
+.Sh FILES
+.Bl -tag -width /dev/tty[jkl][0-7] -compact
+.It /dev/tty[jkl][0-7]
+Serial ports
+.It /dev/sbpp[0-3]
+Parallel ports
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "spif%d: ccr timeout"
@@ -74,17 +81,15 @@ A timeout occurred while writing to one of the CD180 registers.
 Incoming characters were discarded because the application
 in control of the device did not read the input fast enough.
 .El
-.Sh FILES
-.Bl -tag -width /dev/tty[jkl][0-7] -compact
-.It /dev/tty[jkl][0-7]
-Serial ports
-.It /dev/sbpp[0-3]
-Parallel ports
-.El
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr sbus 4 ,
 .Xr tty 4
+.Sh HISTORY
+The
+.Nm
+driver was first supported in
+.Ox 3.1 .
 .Sh AUTHORS
 The driver was written by
 .An Jason Wright Aq jason@thought.net ,
@@ -92,11 +97,6 @@ and is heavily based on the
 .Xr magma 4
 driver written by
 .An Iain Hibbert Aq plunky@skate.demon.co.uk .
-.Sh HISTORY
-The
-.Nm
-driver was first supported in
-.Ox 3.1 .
 .Sh TODO
 The parallel port is not supported yet.
 .Pp
diff --git a/share/man/man4/man4.sparc64/upa.4 b/share/man/man4/man4.sparc64/upa.4
index d496de7dc9e..57261fd001a 100644
--- a/share/man/man4/man4.sparc64/upa.4
+++ b/share/man/man4/man4.sparc64/upa.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: upa.4,v 1.3 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: upa.4,v 1.4 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -37,7 +37,7 @@
 The
 .Nm
 device provides support for the
-.Xr upa 4
+.Nm upa
 bus on sparc64
 systems, most often found on UltraSPARC III based systems.
 .Sh SEE ALSO
diff --git a/share/man/man4/man4.sparc64/uperf.4 b/share/man/man4/man4.sparc64/uperf.4
index 26b1dae15b1..bc75f0a2411 100644
--- a/share/man/man4/man4.sparc64/uperf.4
+++ b/share/man/man4/man4.sparc64/uperf.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: uperf.4,v 1.9 2003/06/02 18:51:34 jason Exp $
+.\"     $OpenBSD: uperf.4,v 1.10 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -135,7 +135,7 @@ contain the values fetched for the counters.
 Software using this interface should be prepared to handle the counters
 rolling over.
 .Pp
-The 
+The
 .Nm
 device responds to the following
 .Xr ioctl 2
@@ -183,11 +183,11 @@ and/or
 .Xr ebus 4 ,
 .Xr intro 4 ,
 .Xr sbus 4
-.Sh AUTHORS
-The driver was written by
-.An Jason Wright Aq jason@thought.net .
 .Sh HISTORY
 The
 .Nm
 driver was first supported in
 .Ox 3.1 .
+.Sh AUTHORS
+The driver was written by
+.An Jason Wright Aq jason@thought.net .
diff --git a/share/man/man4/man4.vax/autoconf.4 b/share/man/man4/man4.vax/autoconf.4
index 4aa9f5d29d3..67650a131cb 100644
--- a/share/man/man4/man4.vax/autoconf.4
+++ b/share/man/man4/man4.vax/autoconf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: autoconf.4,v 1.9 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: autoconf.4,v 1.10 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: autoconf.4,v 1.3 1996/03/03 17:13:13 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -60,7 +60,7 @@ Devices which are not supported which are found in
 .Tn NEXUS
 slots are noted also.
 The Q-bus, if present, is configured in the same way as the
-.Tn UNIBUS.
+.Tn UNIBUS .
 .Pp
 .Tn MASSBUS
 devices are located by a very deterministic procedure since
diff --git a/share/man/man4/man4.vax/dhu.4 b/share/man/man4/man4.vax/dhu.4
index 2d2eb7f3d85..73ed993b608 100644
--- a/share/man/man4/man4.vax/dhu.4
+++ b/share/man/man4/man4.vax/dhu.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhu.4,v 1.10 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: dhu.4,v 1.11 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: dhu.4,v 1.4 1996/03/05 15:28:48 ragge Exp $
 .\"
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
@@ -107,5 +107,5 @@ driver showed up in
 Even if the
 .Nm
 hardware supports
-.Tn DMA,
+.Tn DMA ,
 the driver cannot make use of this capability.
diff --git a/share/man/man4/man4.vax/ibus.4 b/share/man/man4/man4.vax/ibus.4
index b18a0eb1d74..17327eb0b68 100644
--- a/share/man/man4/man4.vax/ibus.4
+++ b/share/man/man4/man4.vax/ibus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ibus.4,v 1.7 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: ibus.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt IBUS 4 VAX
+.Dt IBUS 4 vax
 .Os
 .Sh NAME
 .Nm ibus
diff --git a/share/man/man4/man4.vax/intro.4 b/share/man/man4/man4.vax/intro.4
index fc348a4f824..3831c6162b2 100644
--- a/share/man/man4/man4.vax/intro.4
+++ b/share/man/man4/man4.vax/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.20 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: intro.4,v 1.21 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: intro.4,v 1.3 1996/03/03 17:13:44 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -37,7 +37,7 @@
 .Nm intro
 .Nd introduction to special files and hardware support
 .Sh DESCRIPTION
-The manual pages in section 4 describe the special files, 
+The manual pages in section 4 describe the special files,
 related driver functions, and networking support
 available in the system.
 In this part of the manual, the
diff --git a/share/man/man4/man4.vax/le.4 b/share/man/man4/man4.vax/le.4
index ff47def4f48..b6efb3090f3 100644
--- a/share/man/man4/man4.vax/le.4
+++ b/share/man/man4/man4.vax/le.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: le.4,v 1.7 2003/03/06 20:02:40 jason Exp $
+.\"	$OpenBSD: le.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Brandon Creighton
 .\"
@@ -43,7 +43,7 @@ Am7990 Local Area Network Controller for Ethernet
 .Pq Tn LANCE
 chipset.
 .Pp
-Different machine configurations have varying types of connectors. 
+Different machine configurations have varying types of connectors.
 The following types can be found:
 .Pp
 .Bl -tag -width 10n
diff --git a/share/man/man4/man4.vax/mem.4 b/share/man/man4/man4.vax/mem.4
index b5381dfb7c5..2dba130f6c0 100644
--- a/share/man/man4/man4.vax/mem.4
+++ b/share/man/man4/man4.vax/mem.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mem.4,v 1.8 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: mem.4,v 1.9 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: mem.4,v 1.3 1996/03/03 17:13:50 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -63,7 +63,8 @@ space base address is
 20000000(16);
 on an 11/750
 the
-.Tn I/O space addresses are of the form fxxxxx(16).
+.Tn I/O
+space addresses are of the form fxxxxx(16).
 On all
 .Tn VAX Ns 'en
 the
diff --git a/share/man/man4/man4.vax/mscpbus.4 b/share/man/man4/man4.vax/mscpbus.4
index 83b44a09251..de0885256b2 100644
--- a/share/man/man4/man4.vax/mscpbus.4
+++ b/share/man/man4/man4.vax/mscpbus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mscpbus.4,v 1.7 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: mscpbus.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt MSCPBUS 4 VAX
+.Dt MSCPBUS 4 vax
 .Os
 .Sh NAME
 .Nm mscpbus
diff --git a/share/man/man4/man4.vax/mt.4 b/share/man/man4/man4.vax/mt.4
index 65b731e1b6c..44d4c245378 100644
--- a/share/man/man4/man4.vax/mt.4
+++ b/share/man/man4/man4.vax/mt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mt.4,v 1.8 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: mt.4,v 1.9 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: mt.4,v 1.3 1996/03/03 17:13:52 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -108,4 +108,4 @@ Because 800
 tapes are not supported, the numbering of minor devices
 is inconsistent with triple-density tape units.
 Unit 0 is drive 0, 1600
-.Tn BPI.
+.Tn BPI .
diff --git a/share/man/man4/man4.vax/ncr.4 b/share/man/man4/man4.vax/ncr.4
index c3f39acf07a..d18b347f359 100644
--- a/share/man/man4/man4.vax/ncr.4
+++ b/share/man/man4/man4.vax/ncr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ncr.4,v 1.2 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: ncr.4,v 1.3 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt NCR 4 VAX
+.Dt NCR 4 vax
 .Os
 .Sh NAME
 .Nm ncr
diff --git a/share/man/man4/man4.vax/qe.4 b/share/man/man4/man4.vax/qe.4
index 656744b4bfa..ae8cdd65210 100644
--- a/share/man/man4/man4.vax/qe.4
+++ b/share/man/man4/man4.vax/qe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: qe.4,v 1.8 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: qe.4,v 1.9 2003/06/06 10:29:42 jmc Exp $
 .\"	$NetBSD: qe.4,v 1.3 1996/03/03 17:14:01 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1991 The Regents of the University of California.
@@ -58,7 +58,7 @@ The
 .Nm qe
 interface employs the address resolution protocol described in
 .Xr arp 4
-to map dynamically  between Internet and Ethernet addresses on the local
+to map dynamically between Internet and Ethernet addresses on the local
 network.
 .Pp
 The interface normally tries to use a
diff --git a/share/man/man4/man4.vax/ra.4 b/share/man/man4/man4.vax/ra.4
index a7421595a7c..57e8a3ddee4 100644
--- a/share/man/man4/man4.vax/ra.4
+++ b/share/man/man4/man4.vax/ra.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ra.4,v 1.2 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: ra.4,v 1.3 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt RA 4 VAX
+.Dt RA 4 vax
 .Os
 .Sh NAME
 .Nm ra
@@ -43,7 +43,7 @@ RC25, RX50, RD51, RD52, RD53, RA60, RA80, and RA81.
 block mode
 .Tn MSCP
 disk unit
-.Ar u , 
+.Ar u ,
 partition
 .Ar p
 .It Pa /dev/rra Ns Ar u Ns Ar p
diff --git a/share/man/man4/man4.vax/smg.4 b/share/man/man4/man4.vax/smg.4
index 66920f3842a..39915e0f1e4 100644
--- a/share/man/man4/man4.vax/smg.4
+++ b/share/man/man4/man4.vax/smg.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smg.4,v 1.3 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: smg.4,v 1.4 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt SMG 4 VAX
+.Dt SMG 4 vax
 .Os
 .Sh NAME
 .Nm smg
diff --git a/share/man/man4/man4.vax/vsbus.4 b/share/man/man4/man4.vax/vsbus.4
index 78724f8174a..e3a9ef6d3b4 100644
--- a/share/man/man4/man4.vax/vsbus.4
+++ b/share/man/man4/man4.vax/vsbus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vsbus.4,v 1.7 2003/06/02 18:51:34 jason Exp $
+.\"	$OpenBSD: vsbus.4,v 1.8 2003/06/06 10:29:42 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 6, 2003
-.Dt VSBUS 4 VAX
+.Dt VSBUS 4 vax
 .Os
 .Sh NAME
 .Nm vsbus
diff --git a/share/man/man4/midi.4 b/share/man/man4/midi.4
index 34c9298add3..f569506a84e 100644
--- a/share/man/man4/midi.4
+++ b/share/man/man4/midi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: midi.4,v 1.12 2002/11/28 23:27:40 mickey Exp $
+.\" $OpenBSD: midi.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: midi.4,v 1.4 1998/08/22 14:45:35 augustss Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@ The
 .Pa /dev/rmidiN
 devices provides raw access to a MIDI device.
 Data written is sent to the physical device as fast as possible and
-is uninterpreted. 
+is uninterpreted.
 Reading from the device returns data as soon as it becomes available.
 A moderate amount of buffering is available both for reading and writing.
 The raw MIDI devices are mostly useful for non realtime operations, such as
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index 54d5ed3c35a..80ba75dc370 100644
--- a/share/man/man4/ncr.4
+++ b/share/man/man4/ncr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ncr.4,v 1.10 2003/03/30 12:14:31 jmc Exp $
+.\"	$OpenBSD: ncr.4,v 1.11 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1994 James A. Jegers
 .\" All rights reserved.
@@ -119,17 +119,6 @@ ASUS SC875, Diamond FirePort 40, and Symbios SYM8751S.
 Specifies that the driver should use the register configuration set by the
 firmware instead of configuring the chip itself.
 .El
-.Sh BUGS
-Some Quantum drives (specifically the Atlas series) return
-.Dq queue full
-responses when a very small number of tags is used which can confuse
-the driver.
-With such drives, you can use
-.Bd -literal
-option  SCSI_NCR_DFLT_TAGS=0
-.Ed
-.Pp
-in your kernel configuration file to disable tagged command queuing.
 .Sh SEE ALSO
 .Xr cd 4 ,
 .Xr ch 4 ,
@@ -141,3 +130,14 @@ in your kernel configuration file to disable tagged command queuing.
 .Xr ss 4 ,
 .Xr st 4 ,
 .Xr uk 4
+.Sh BUGS
+Some Quantum drives (specifically the Atlas series) return
+.Dq queue full
+responses when a very small number of tags is used which can confuse
+the driver.
+With such drives, you can use
+.Bd -literal
+option  SCSI_NCR_DFLT_TAGS=0
+.Ed
+.Pp
+in your kernel configuration file to disable tagged command queuing.
diff --git a/share/man/man4/ne.4 b/share/man/man4/ne.4
index 7de5f1320a0..8caed40b355 100644
--- a/share/man/man4/ne.4
+++ b/share/man/man4/ne.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ne.4,v 1.13 2003/05/05 13:51:58 jmc Exp $
+.\"	$OpenBSD: ne.4,v 1.14 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ne.4,v 1.4 1998/02/22 05:21:20 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -113,7 +113,6 @@ cards, including:
 .It Li "Wisecom T210CT, iPort" Ta PCMCIA
 .It Li "Xircom CFE-10" Ta PCMCIA
 .El
-.Pp
 .Sh MEDIA SELECTION
 The Realtek 8019 (ISA, ISAPnP, some PCMCIA) and Realtek 8029 (PCI)
 NE2000-compatible Ethernet chips include support for software media
diff --git a/share/man/man4/neo.4 b/share/man/man4/neo.4
index fd7fba4a317..17435698b70 100644
--- a/share/man/man4/neo.4
+++ b/share/man/man4/neo.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: neo.4,v 1.7 2002/09/26 07:55:40 miod Exp $
+.\" $OpenBSD: neo.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Constantine Paul Sapuntzakis
 .\" All rights reserved
@@ -48,13 +48,13 @@ audio chips found in many laptops, and perhaps on some PCI cards.
 .Xr audio 4 ,
 .Xr intro 4 ,
 .Xr pci 4
-.Sh BUGS
-This driver has some bugs because Neomagic refuses to provide documentation,
-even though they are discontinuing their products.
-At the time of contact, all persons working at the company were hiding
-behind their receptionist as if in a stage of siege.
 .Sh HISTORY
 The
 .Nm
 device driver appeared in
 .Ox 2.7 .
+.Sh BUGS
+This driver has some bugs because Neomagic refuses to provide documentation,
+even though they are discontinuing their products.
+At the time of contact, all persons working at the company were hiding
+behind their receptionist as if in a stage of siege.
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 8e337488275..ffd45328e95 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netintro.4,v 1.21 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: netintro.4,v 1.22 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: netintro.4,v 1.4 1995/10/19 08:03:40 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -172,7 +172,7 @@ This facility is described in
 .Xr route 4 .
 .Sh INTERFACES
 Each network interface in a system corresponds to a
-path through which messages may be sent and received. 
+path through which messages may be sent and received.
 A network interface usually has a hardware device associated with it,
 though certain interfaces such as the loopback interface,
 .Xr lo 4 ,
diff --git a/share/man/man4/ns.4 b/share/man/man4/ns.4
index bf9e535c6b8..5fbb29192f0 100644
--- a/share/man/man4/ns.4
+++ b/share/man/man4/ns.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ns.4,v 1.12 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: ns.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ns.4,v 1.3 1994/11/30 16:22:26 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -45,7 +45,7 @@ The
 .Tn NS
 protocol family is a collection of protocols
 layered atop the
-.Em Internet  Datagram  Protocol
+.Em Internet Datagram Protocol
 .Pq Tn IDP
 transport layer, and using the Xerox
 .Tn NS
diff --git a/share/man/man4/nsip.4 b/share/man/man4/nsip.4
index 4390987774a..becf4320ffb 100644
--- a/share/man/man4/nsip.4
+++ b/share/man/man4/nsip.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nsip.4,v 1.8 2003/06/02 23:30:12 millert Exp $
+.\"	$OpenBSD: nsip.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: nsip.4,v 1.3 1994/11/30 16:22:27 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -119,7 +119,7 @@ to remove that partner.
 This was intended to postpone the necessity of rewriting reverse
 .Tn ARP
 for the
-.Xr en 4
+.Xr en
 device, and to allow passing
 .Tn XNS
 packets through an
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 0a4c38f944e..48442c8561d 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.126 2003/05/20 03:13:46 tedu Exp $
+.\"	$OpenBSD: options.4,v 1.127 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -550,8 +550,8 @@ Provide in-kernel support for controlling VGA framebuffer mapping
 and PCI configuration registers by user-processes
 (such as an X Window System server).
 This option is supported on the
-.Va alpha Ns ,
-.Va i386 Ns ,
+.Va alpha ,
+.Va i386 ,
 .Va macppc
 and
 .Va sparc64
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 21fa0381dec..78862dd4f06 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.74 2003/05/05 13:51:58 jmc Exp $
+.\"	$OpenBSD: pci.4,v 1.75 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -456,7 +456,7 @@ driver.
 .Xr eisa 4 ,
 .Xr em 4 ,
 .Xr emu 4 ,
-.Xr en 4 ,
+.\" no manpage .Xr en 4 ,
 .Xr ep 4 ,
 .Xr esa 4 ,
 .Xr eso 4 ,
diff --git a/share/man/man4/pckbc.4 b/share/man/man4/pckbc.4
index 20fb147a669..dc91bca1252 100644
--- a/share/man/man4/pckbc.4
+++ b/share/man/man4/pckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbc.4,v 1.8 2003/02/19 09:01:47 jmc Exp $
+.\" $OpenBSD: pckbc.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: pckbc.4,v 1.2 2000/06/16 06:42:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -59,4 +59,4 @@ slot for mice (the latter might be missing in older keyboard controllers).
 .Xr isa 4 ,
 .Xr pckbd 4 ,
 .Xr pms 4 ,
-.Xr pmsi 4 ,
+.Xr pmsi 4
diff --git a/share/man/man4/pcscp.4 b/share/man/man4/pcscp.4
index 85df17fdc2d..4d7455d7af8 100644
--- a/share/man/man4/pcscp.4
+++ b/share/man/man4/pcscp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcscp.4,v 1.4 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: pcscp.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: pcscp.4,v 1.3 1999/09/12 18:47:12 kleink Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@ For
 .Tn SCSI
 host adapters, use the
 .Xr ncr 4
-.\" or 
+.\" or
 .\" .Xr siop 4
 driver.
 .Sh SEE ALSO
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 7155790dc38..c67fa8d1cf6 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.4,v 1.31 2003/05/24 14:29:29 cedric Exp $
+.\"	$OpenBSD: pf.4,v 1.32 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (C) 2001, Kjell Wooding.  All rights reserved.
 .\"
@@ -416,7 +416,8 @@ If the buffer is too small, the kernel does not store anything but just
 returns the required buffer size, without error.
 .It Dv DIOCRGETTSTATS Fa "struct pfioc_table"
 Like
-.Dv DIOCRGETTABLES, but returns an array of pfr_tstats structures.
+.Dv DIOCRGETTABLES ,
+but returns an array of pfr_tstats structures.
 .Bd -literal
 struct pfr_tstats {
         struct pfr_table pfrts_t;
@@ -477,7 +478,7 @@ On exit, pfrio_ndel, pfrio_nadd and pfrio_nchange contain the number of
 addresses deleted, added and changed by the kernel.
 If pfrio_size2 was set on
 entry, pfrio_size2 will point to the size of the buffer used, exactly like
-.Dv DIOCRGETADDRS.
+.Dv DIOCRGETADDRS .
 .It Dv DIOCRGETADDRS Fa "struct pfioc_table"
 Get all the addresses of a table.
 On entry, pfrio_table contains the table id and pfrio_buffer[pfrio_size]
@@ -487,7 +488,8 @@ If the buffer was too small, the kernel does not store anything but just
 return the required buffer size, without returning an error.
 .It Dv DIOCRGETASTATS Fa "struct pfioc_table"
 Like
-.Dv DIOCRGETADDRS, but returns an array of pfr_astats structures.
+.Dv DIOCRGETADDRS ,
+but returns an array of pfr_astats structures.
 .Bd -literal
 struct pfr_astats {
         struct pfr_addr  pfras_a;
diff --git a/share/man/man4/pflog.4 b/share/man/man4/pflog.4
index 0dd0983ecd1..c82a6c449f9 100644
--- a/share/man/man4/pflog.4
+++ b/share/man/man4/pflog.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pflog.4,v 1.2 2003/06/03 01:00:49 weingart Exp $
+.\"	$OpenBSD: pflog.4,v 1.3 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Tobias Weingartner
 .\" All rights reserved.
@@ -50,7 +50,7 @@ with it of length
 This header documents the address family, interface name, rule
 number, reason, action, and direction of the packet that was logged.
 This structure, defined in
-.Pa <net/if_pflog.h>
+.Aq Pa net/if_pflog.h
 looks like
 .Bd -literal -offset indent
 struct pfloghdr {
diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4
index 7e717f718c3..21dd7d5412f 100644
--- a/share/man/man4/pfsync.4
+++ b/share/man/man4/pfsync.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pfsync.4,v 1.5 2003/04/01 18:07:28 mickey Exp $
+.\"	$OpenBSD: pfsync.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved.
@@ -51,7 +51,7 @@ The header indicates the version of the protocol, address family,
 action taken on the following states and the number of state
 table entries attached in this packet.
 This structure, defined in
-.Pa <net/if_pfsync.h>
+.Aq Pa net/if_pfsync.h
 looks like:
 .Bd -literal -offset indent
 struct pfsync_header {
diff --git a/share/man/man4/ppb.4 b/share/man/man4/ppb.4
index f1c289aa598..9af8cddce1d 100644
--- a/share/man/man4/ppb.4
+++ b/share/man/man4/ppb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ppb.4,v 1.4 2003/06/02 18:51:33 jason Exp $
+.\"	$OpenBSD: ppb.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -46,6 +46,5 @@ bridges, including
 expansion backplanes.
 These devices are largely transparent and provide no user accessible
 entry points.
-.Pp
 .Sh SEE ALSO
 .Xr pci 4
diff --git a/share/man/man4/radio.4 b/share/man/man4/radio.4
index b6905f3bae9..54b38a49349 100644
--- a/share/man/man4/radio.4
+++ b/share/man/man4/radio.4
@@ -1,5 +1,5 @@
 .\"	$RuOBSD: radio.4,v 1.4 2001/10/26 05:38:43 form Exp $
-.\"	$OpenBSD: radio.4,v 1.17 2003/03/30 12:14:31 jmc Exp $
+.\"	$OpenBSD: radio.4,v 1.18 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -208,10 +208,15 @@ cards.
 .Xr intro 4 ,
 .Xr rt 4 ,
 .Xr rtii 4 ,
-.Xr sfr 4 ,
 .Xr sf2r 4 ,
+.Xr sfr 4 ,
 .Xr udsbr 4 ,
 .Xr radio 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -221,8 +226,3 @@ and
 .An Maxim Tsyplakov Aq tm@oganer.net .
 The man page was written by
 .An Vladimir Popov Aq jumbo@narod.ru .
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 3.0 .
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index 725305f5137..afb3ea870b5 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: random.4,v 1.17 2003/06/02 22:11:25 mickey Exp $
+.\"	$OpenBSD: random.4,v 1.18 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1996, 1997 Michael Shalayeff
 .\"
@@ -71,14 +71,6 @@ The
 function in userland libraries seeds itself from this device,
 providing a second level of ARC4 hashed data.
 .El
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr md5 3 ,
-.Xr random 3 ,
-.Xr amdpm 4 ,
-.Xr pchb 4 ,
-.Xr md5 9 ,
-.Xr random 9
 .Sh FILES
 .Bl -tag -width /dev/srandom -compact
 .It Pa /dev/random
@@ -87,8 +79,14 @@ providing a second level of ARC4 hashed data.
 .It Pa /dev/prandom
 .It Pa /dev/arandom
 .El
-.Sh BUGS
-No randomness testing suite provided.
+.Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr md5 3 ,
+.Xr random 3 ,
+.Xr amdpm 4 ,
+.Xr pchb 4 ,
+.Xr md5 9 ,
+.Xr random 9
 .Sh HISTORY
 A
 .Nm
@@ -96,3 +94,5 @@ device first appeared in Linux operating system.
 This is a cloned interface.
 .Pp
 ARC4 routines added by David Mazieres.
+.Sh BUGS
+No randomness testing suite provided.
diff --git a/share/man/man4/ray.4 b/share/man/man4/ray.4
index 73fee7cb1a4..30b367f8cce 100644
--- a/share/man/man4/ray.4
+++ b/share/man/man4/ray.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ray.4,v 1.8 2002/10/15 11:59:02 deraadt Exp $
+.\"	$OpenBSD: ray.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ray.4,v 1.5 2000/02/28 13:54:55 enami Exp $
 .\"
 .\" Copyright (c) 2000 Christian E. Hopps
@@ -131,6 +131,14 @@ Indicates the card has failed its initial startup tests.
 .Xr pcmcia 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Nx 1.5 .
+.Ox
+support was added in
+.Ox 2.7 .
 .Sh AUTHORS
 The
 .Nm
@@ -144,14 +152,6 @@ Support for interoperating with newer
 .Tn Windows
 driver was added by
 .An Steve Weiss Aq srw@alum.mit.edu .
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Nx 1.5 .
-.Ox
-support was added in
-.Ox 2.7 .
 .Sh BUGS
 Currently the infrastructure mode is untested, and authentication
 using WEP is unimplemented.
diff --git a/share/man/man4/rln.4 b/share/man/man4/rln.4
index 63d065f7a3b..0558ab6b53e 100644
--- a/share/man/man4/rln.4
+++ b/share/man/man4/rln.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rln.4,v 1.18 2003/05/05 13:51:58 jmc Exp $
+.\"	$OpenBSD: rln.4,v 1.19 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" David Leonard <d@openbsd.org>, 1999. Public Domain.
 .\"
@@ -124,16 +124,16 @@ The card model was not matched in the known-card tables.
 .Sh AUTHORS
 David Leonard,
 Dept Computer Science and Electrical Engineering, University of Queensland
-.Pa "<david.leonard@csee.uq.edu.au>"
+.Aq david.leonard@csee.uq.edu.au .
 .Pp
 Information and ideas gleaned from disassembly of Dave Koberstein's
-.Pa "<davek@komacke.com>"
+.Aq davek@komacke.com
 Linux driver (which apparently uses Proxim code),
 from Yoichi Shinoda's
-.Pa "<shinoda@cs.washington.edu>"
+.Aq shinoda@cs.washington.edu
 BSDI driver, and
 Geoff Voelker's
-.Pa "<voelker@cs.washington.edu>"
+.Aq voelker@cs.washington.edu
 Linux port of the same.
 .Sh BUGS
 This driver has not been tested with lots of cards, so there are bound
diff --git a/share/man/man4/rt.4 b/share/man/man4/rt.4
index a5352fa8202..c664ad5eb9a 100644
--- a/share/man/man4/rt.4
+++ b/share/man/man4/rt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rt.4,v 1.8 2003/04/03 11:02:36 jmc Exp $
+.\"	$OpenBSD: rt.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"	$RuOBSD: rt.4,v 1.3 2001/10/26 05:38:43 form Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov <jumbo@narod.ru>
@@ -53,19 +53,17 @@ for details.
 The Radiotrack cards take only one I/O port.
 The I/O port is set by the driver to the value specified in
 the configuration file and must be either 0x20c or 0x30c.
-.Sh BUGS
-Support for the SF16-FMI cards is rather ugly, the driver can not
-determine signal state and force audio output to mono.
-.Pp
-It is impossible to determine the frequency tuned into.
-Thus, the driver will report an internally stored value even if it is not
-correct (e.g. tunning was done through the direct I/O access).
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr isa 4 ,
 .Xr isapnp 4 ,
 .Xr radio 4 ,
 .Xr radio 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -75,8 +73,10 @@ and
 .An Maxim Tsyplakov Aq tm@oganer.net .
 The man page was written by
 .An Vladimir Popov Aq jumbo@narod.ru .
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 3.0 .
+.Sh BUGS
+Support for the SF16-FMI cards is rather ugly, the driver can not
+determine signal state and force audio output to mono.
+.Pp
+It is impossible to determine the frequency tuned into.
+Thus, the driver will report an internally stored value even if it is not
+correct (e.g. tunning was done through the direct I/O access).
diff --git a/share/man/man4/rtii.4 b/share/man/man4/rtii.4
index 7030995cff7..450f640cbfb 100644
--- a/share/man/man4/rtii.4
+++ b/share/man/man4/rtii.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtii.4,v 1.7 2003/04/03 11:02:36 jmc Exp $
+.\"	$OpenBSD: rtii.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"	$RuOBSD: rtii.4,v 1.3 2001/10/26 05:38:44 form Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov <jumbo@narod.ru>
@@ -60,6 +60,11 @@ chip is used.
 .Xr isa 4 ,
 .Xr radio 4 ,
 .Xr radio 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -69,8 +74,3 @@ and
 .An Maxim Tsyplakov Aq tm@oganer.net .
 The man page was written by
 .An Vladimir Popov Aq jumbo@narod.ru .
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 3.0 .
diff --git a/share/man/man4/sf2r.4 b/share/man/man4/sf2r.4
index daa202d7407..a353fcba8c9 100644
--- a/share/man/man4/sf2r.4
+++ b/share/man/man4/sf2r.4
@@ -1,5 +1,5 @@
 .\"	$RuOBSD: sf2r.4,v 1.3 2001/10/26 05:38:44 form Exp $
-.\"	$OpenBSD: sf2r.4,v 1.9 2003/04/07 16:03:32 jmc Exp $
+.\"	$OpenBSD: sf2r.4,v 1.10 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -64,6 +64,11 @@ The current driver supports both variants.
 .Xr isa 4 ,
 .Xr radio 4 ,
 .Xr radio 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -73,8 +78,3 @@ and
 .An Maxim Tsyplakov Aq tm@oganer.net .
 The man page was written by
 .An Vladimir Popov Aq jumbo@narod.ru .
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 3.0 .
diff --git a/share/man/man4/sfr.4 b/share/man/man4/sfr.4
index 3bef327b6e1..747d3a28058 100644
--- a/share/man/man4/sfr.4
+++ b/share/man/man4/sfr.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sfr.4,v 1.4 2003/04/07 16:03:32 jmc Exp $
+.\"	$OpenBSD: sfr.4,v 1.5 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Vladimir Popov
 .\" All rights reserved.
@@ -56,13 +56,13 @@ file and must be 0x384 or 0x284.
 .Xr isa 4 ,
 .Xr radio 4 ,
 .Xr radio 9
-.Sh AUTHORS
-The
-.Nm
-driver and the man page was written by
-.An Vladimir Popov Aq jumbo@narod.ru .
 .Sh HISTORY
 The
 .Nm
 device driver appeared in
 .Ox 3.2 .
+.Sh AUTHORS
+The
+.Nm
+driver and the man page was written by
+.An Vladimir Popov Aq jumbo@narod.ru .
diff --git a/share/man/man4/siop.4 b/share/man/man4/siop.4
index 27d63114603..ff2d00947f9 100644
--- a/share/man/man4/siop.4
+++ b/share/man/man4/siop.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: siop.4,v 1.7 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: siop.4,v 1.8 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: siop.4,v 1.3 2000/10/23 16:38:10 bouyer Exp $
 .\"
 .\" Copyright (c) 2000 Manuel Bouyer.
@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
diff --git a/share/man/man4/ss.4 b/share/man/man4/ss.4
index 1527252883c..2a966b51d10 100644
--- a/share/man/man4/ss.4
+++ b/share/man/man4/ss.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ss.4,v 1.11 2003/04/07 16:03:32 jmc Exp $
+.\" $OpenBSD: ss.4,v 1.12 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Kenneth Stailey and Ian Darwin
 .\"
@@ -94,6 +94,12 @@ ioctl(fd, SCIOCSET, &sp) to set the changed parms;
 ioctl(fd, SCIOCGET, &sp) to see if things got rounded or truncated
 read(fd, somebuf, sp.scan_window_size);
 write the data someplace where you want it.
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr scsi 4 ,
+.Xr usscanner 4
+.Pp
+Documentation from the various scanner vendors.
 .Sh BUGS
 Image data should either be normalized to a particular format
 or some indication as to what the format is should be provided.
@@ -117,9 +123,3 @@ Eventually a program similar to
 or
 .Xr mt 1
 will be written.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr scsi 4 ,
-.Xr usscanner 4
-.Pp
-Documentation from the various scanner vendors.
diff --git a/share/man/man4/sti.4 b/share/man/man4/sti.4
index eab424b5e06..9322e844e23 100644
--- a/share/man/man4/sti.4
+++ b/share/man/man4/sti.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sti.4,v 1.12 2003/06/02 22:11:25 mickey Exp $
+.\"	$OpenBSD: sti.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Michael Shalayeff
 .\" All rights reserved.
@@ -225,9 +225,6 @@ Colour frame buffer support.
 .%D March 1, 2000
 .%I Hewlett-Packard
 .Re
-.Sh BUGS
-Currently, neither scroll back nor screen blanking functions
-are implemented.
 .Sh HISTORY
 The
 .Nm
@@ -236,3 +233,6 @@ driver was written by
 for HPPA
 port for
 .Ox 2.7 .
+.Sh BUGS
+Currently, neither scroll back nor screen blanking functions
+are implemented.
diff --git a/share/man/man4/strip.4 b/share/man/man4/strip.4
index 211d8bd36fd..df280de1da2 100644
--- a/share/man/man4/strip.4
+++ b/share/man/man4/strip.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strip.4,v 1.15 2003/04/07 16:03:32 jmc Exp $
+.\"	$OpenBSD: strip.4,v 1.16 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright 1996 The Board of Trustees of The Leland Stanford
 .\" Junior University. All Rights Reserved.
@@ -172,6 +172,18 @@ by
 .Xr route 8 ,
 .Xr slattach 8 ,
 .Xr slip 8
+.Sh HISTORY
+.Nm
+was originally developed for the Linux kernel by Stuart
+Cheshire of Stanford's Operating Systems and Networking group,
+as part of Mary Baker's MosquitoNet
+.Sy http://mosquitonet.stanford.edu/mosquitonet.html
+project.
+This
+.Nm
+driver was ported to BSD by Jonathan Stone at Stanford's Distributed
+Systems Group and first distributed with
+.Nx 1.2 .
 .Sh BUGS
 Currently is IP-only.
 Encapsulations for AppleTalk and ARP have been defined,
@@ -187,15 +199,3 @@ One workaround is to kill the
 process, ifconfig the
 .Nm
 interface down, and then start a new slattach and rerun ifconfig.
-.Sh HISTORY
-.Nm
-was originally developed for the Linux kernel by Stuart
-Cheshire of Stanford's Operating Systems and Networking group,
-as part of Mary Baker's MosquitoNet
-.Sy http://mosquitonet.stanford.edu/mosquitonet.html
-project.
-This
-.Nm
-driver was ported to BSD by Jonathan Stone at Stanford's Distributed
-Systems Group and first distributed with
-.Nx 1.2 .
diff --git a/share/man/man4/systrace.4 b/share/man/man4/systrace.4
index dbb6dc56c0b..5dbb4f54992 100644
--- a/share/man/man4/systrace.4
+++ b/share/man/man4/systrace.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systrace.4,v 1.6 2003/06/03 02:08:12 wcobb Exp $
+.\"	$OpenBSD: systrace.4,v 1.7 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2002, 2003 CubeSoft Communications, Inc.
 .\" All rights reserved.
@@ -11,7 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 89a362e23ed..6a5834f05b1 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: termios.4,v 1.21 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: termios.4,v 1.22 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: termios.4,v 1.5 1994/11/30 16:22:36 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1992, 1993
@@ -46,7 +46,7 @@ When a terminal file is opened, it normally causes the process to wait
 until a connection is established.
 For most hardware, the presence of a connection is indicated by the assertion
 of the hardware
-.Dv CARRIER line.
+.Dv CARRIER line .
 If the termios structure associated with the terminal file has the
 .Dv CLOCAL
 flag set in the cflag, or if the
@@ -174,8 +174,8 @@ the process's group
 unless one of the
 following special cases apply: If the reading process is ignoring or
 blocking the
-.Dv SIGTTIN signal, or if the process group of the reading
-process is orphaned, the
+.Dv SIGTTIN
+signal, or if the process group of the reading process is orphaned, the
 .Xr read 2
 returns -1 with
 .Va errno
@@ -339,7 +339,7 @@ characters (see the
 is received.
 This processing affects data in the input queue that has not yet been
 delimited by a newline
-.Dv NL,
+.Dv NL ,
 .Dv EOF ,
 or
 .Dv EOL
@@ -672,7 +672,7 @@ Secondary
 .Dv EOL
 character.
 Same function as
-.Dv EOL.
+.Dv EOL .
 .It Dv WERASE
 Special character on input and is recognized if the
 .Dv ICANON
@@ -750,7 +750,7 @@ described later in the document under
 Special
 character functions associated with changeable special control characters
 can be disabled individually by setting their value to
-.Dv {_POSIX_VDISABLE};
+.Dv {_POSIX_VDISABLE} ;
 see
 .Sx "Special Control Characters" .
 .Pp
@@ -1046,7 +1046,7 @@ and are composed of the following masks:
 /* enable following output processing */
 .It Dv ONLCR
 /* map NL to CR-NL (ala
-.Dv CRMOD)
+.Dv CRMOD )
 */
 .It Dv OXTABS
 /* expand tabs to spaces */
@@ -1367,10 +1367,10 @@ If
 is set, canonical processing is enabled.
 This enables the erase and kill edit functions, and the assembly of input
 characters into lines delimited by
-.Dv NL,
+.Dv NL ,
 .Dv EOF ,
 and
-.Dv EOL,
+.Dv EOL ,
 as described in
 .Sx "Canonical Mode Input Processing" .
 .Pp
diff --git a/share/man/man4/tp.4 b/share/man/man4/tp.4
index ae793ddcfe4..9d9c390ce90 100644
--- a/share/man/man4/tp.4
+++ b/share/man/man4/tp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tp.4,v 1.20 2003/06/02 23:30:13 millert Exp $
+.\"	$OpenBSD: tp.4,v 1.21 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: tp.4,v 1.4 1994/11/30 16:22:38 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -212,7 +212,7 @@ for the
 and
 .Dv TPOPT_CONN_DATA
 for
-.Va cmsg_type.
+.Va cmsg_type .
 .It Dv TPOPT_DISC_DATA \&#
 (char *) [none]
 .br
@@ -405,7 +405,7 @@ implementation places upper bounds of
 .It Ar p_ack_strat
 .Dv TPACK_EACH
 or
-.Dv TPACK_WINDOW.
+.Dv TPACK_WINDOW .
 .Bq Dv TPACK_WINDOW
 .br
 This parameter applies only to class 4.
@@ -621,7 +621,7 @@ system call, the system call may be interrupted,
 in which case the
 .Va errno
 value upon return from the system call is
-.Er EINTR.
+.Er EINTR .
 If the signal
 .Dv SIGURG
 is being handled by reading
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 8fd252c3f62..b656b5b78c6 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tun.4,v 1.25 2003/03/11 07:54:01 david Exp $
+.\"	$OpenBSD: tun.4,v 1.26 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Marcus D. Watts  All rights reserved.
 .\"
@@ -202,13 +202,14 @@ interface address assigned to it, such as via
 .Dv SIOCSIFADDR .
 .El
 .Sh SEE ALSO
-.Xr intro 4 ,
 .Xr inet 4 ,
+.Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr ifconfig 8
 .Sh BUGS
-There is no way to set TUN_STAYUP.
-.br
+There is no way to set
+.Dv TUN_STAYUP .
+.Pp
 .Dv TUNSIFINFO
 does no checking on
 .Va flags .
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index bde1d1db0a4..e62325b4ceb 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: twe.4,v 1.16 2002/12/08 14:59:26 mickey Exp $
+.\"	$OpenBSD: twe.4,v 1.17 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000,2001 Michael Shalayeff.  All rights reserved.
 .\" Public Domain.
@@ -33,6 +33,11 @@ and/or RAID sets appear as
 .Xr pci 4 ,
 .Xr scsi 4 ,
 .Xr sd 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 2.8 .
 .Sh AUTHORS
 The
 .Nm
@@ -42,11 +47,6 @@ inspired by the
 .Fx
 driver by
 .An Mike Smith Aq msmith@freebsd.org .
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 2.8 .
 .Sh BUGS
 The card's BIOS seems to conflict with some other disk controllers
 which have their own BIOS, if such devices are configured earlier
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index 11159d0ec9c..63d5e009c51 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: tx.4,v 1.11 2003/06/02 18:51:33 jason Exp $
+.\"     $OpenBSD: tx.4,v 1.12 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -115,11 +115,11 @@ While resetting, the driver failed to stop the device correctly.
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
-.Sh BUGS
-Multicast packet filtering is not supported.
 .Sh HISTORY
 .Ox
 support for the
 .Nm
 first appeared in
 .Ox 2.4 .
+.Sh BUGS
+Multicast packet filtering is not supported.
diff --git a/share/man/man4/ukphy.4 b/share/man/man4/ukphy.4
index ab9a3067f17..a393e6ea2c5 100644
--- a/share/man/man4/ukphy.4
+++ b/share/man/man4/ukphy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ukphy.4,v 1.6 2001/11/13 13:54:26 mpech Exp $
+.\"	$OpenBSD: ukphy.4,v 1.7 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: ukphy.4,v 1.1 1999/09/08 13:59:07 soren Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,13 +48,13 @@
 The
 .Nm
 driver supports the basic functionality of most Ethernet PHYs.
-.Sh CAVEATS
-In areas where the programming interface for PHYs differ, such
-as detecting the currently active medium, this driver often
-does not work optimally.
-When available, it is best to use a PHY-specific driver.
 .Sh SEE ALSO
 .Xr ifmedia 4 ,
 .Xr intro 4 ,
 .Xr mii 4 ,
 .Xr ifconfig 8
+.Sh CAVEATS
+In areas where the programming interface for PHYs differ, such
+as detecting the currently active medium, this driver often
+does not work optimally.
+When available, it is best to use a PHY-specific driver.
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index e4b3d901c1c..8f0b0c4516e 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urio.4,v 1.12 2002/09/26 22:09:53 miod Exp $
+.\" $OpenBSD: urio.4,v 1.13 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: urio.4,v 1.1 2000/04/14 14:48:29 augustss Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -66,7 +66,8 @@ will download a song over the
 connection into your Rio500.
 .Sh SEE ALSO
 .Xr uhub 4 ,
-.Xr usb 4 ,
+.Xr usb 4
+.Pp
 .Pa /usr/ports/audio/rio500
 .Sh HISTORY
 The
diff --git a/share/man/man4/usscanner.4 b/share/man/man4/usscanner.4
index 995b06348f3..066a86c6d05 100644
--- a/share/man/man4/usscanner.4
+++ b/share/man/man4/usscanner.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usscanner.4,v 1.2 2002/09/26 22:09:53 miod Exp $
+.\" $OpenBSD: usscanner.4,v 1.3 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: usscanner.4,v 1.1 2001/01/11 06:10:01 augustss Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -61,9 +61,9 @@ driver works with the following scanners:
 .Xr intro 4 ,
 .Xr scsi 4 ,
 .Xr ss 4 ,
-.Xr uscanner 4 ,
 .Xr uhub 4 ,
-.Xr usb 4
+.Xr usb 4 ,
+.Xr uscanner 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index c409240c3dc..ac0fc778536 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vlan.4,v 1.18 2003/04/11 04:32:28 jmc Exp $
+.\" $OpenBSD: vlan.4,v 1.19 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -148,6 +148,8 @@ The
 interface is to be configured with
 .Xr ifconfig 8 ,
 see its manual page for more information.
+.Sh AUTHORS
+Originally wollman@freebsd.org.
 .Sh BUGS
 The 802.1Q specification allows for operation over FDDI and Token Ring
 as well as Ethernet.
@@ -169,5 +171,3 @@ This driver could be the basis for support of the Cisco ISL VLAN protocol,
 detailed at http://www.cisco.com/warp/public/473/741_4.html .
 Unfortunately, public reimplementation of this protocol is currently prevented
 by patent (at least in the USA).
-.Sh AUTHORS
-Originally wollman@freebsd.org.
diff --git a/share/man/man4/wdc.4 b/share/man/man4/wdc.4
index 03f9811c53a..d36965aa6c0 100644
--- a/share/man/man4/wdc.4
+++ b/share/man/man4/wdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wdc.4,v 1.8 2002/12/31 16:22:26 miod Exp $
+.\"	$OpenBSD: wdc.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: wdc.4,v 1.4 1999/05/19 14:44:02 bouyer Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -31,7 +31,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
 .Dd October 15, 1998
 .Dt WDC 4
 .Os
diff --git a/share/man/man4/we.4 b/share/man/man4/we.4
index d8fcf22bc64..2e5e9d47bb9 100644
--- a/share/man/man4/we.4
+++ b/share/man/man4/we.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: we.4,v 1.10 2003/04/11 04:32:28 jmc Exp $
+.\"	$OpenBSD: we.4,v 1.11 2003/06/06 10:29:41 jmc Exp $
 .\"	$NetBSD: we.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -83,7 +83,6 @@ The SMC Elite Ultra does not work in
 .Dq soft configuration
 mode.
 .Pp
-.Pp
 To enable the AUI media, select the
 .Em 10base5
 or
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4
index ff452f63e76..5758cb5641b 100644
--- a/share/man/man4/wsdisplay.4
+++ b/share/man/man4/wsdisplay.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsdisplay.4,v 1.21 2003/05/14 06:48:13 miod Exp $
+.\" $OpenBSD: wsdisplay.4,v 1.22 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: wsdisplay.4,v 1.5 2000/05/13 15:22:19 mycroft Exp $
 .\"
 .\" Copyright (c) 1999 Matthias Drochner.
@@ -96,7 +96,7 @@ A device specification containing a positive value here will only match
 if the device is in use as system console.
 (The console device selection in early system startup is not influenced.)
 This way, the console device can be connected to a known
-.Xr wsdisplay 4
+.Nm wsdisplay
 device instance.
 (Naturally, only
 .Dq emulating
@@ -178,13 +178,13 @@ control device
 .Sh SEE ALSO
 .Xr agten 4 ,
 .Xr bwtwo 4 ,
-.Xr cgthree 4 ,
-.Xr cgtwo 4 ,
+.Xr cgeight 4 ,
 .Xr cgfour 4 ,
+.Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
-.Xr cgeight 4 ,
+.Xr cgthree 4 ,
 .Xr cgtwelve 4 ,
-.Xr cgfourteen 4 ,
+.Xr cgtwo 4 ,
 .Xr creator 4 ,
 .Xr intro 4 ,
 .Xr mgx 4 ,
@@ -193,8 +193,8 @@ control device
 .Xr sti 4 ,
 .Xr tcx 4 ,
 .Xr tga 4 ,
-.Xr tvtwo 4 ,
 .Xr tty 4 ,
+.Xr tvtwo 4 ,
 .Xr vga 4 ,
 .Xr vgafb 4 ,
 .Xr vigra 4 ,
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index cd0ae977674..6c5ccd8ee32 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wskbd.4,v 1.10 2003/04/11 04:32:28 jmc Exp $
+.\" $OpenBSD: wskbd.4,v 1.11 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
 .\"
 .\" Copyright (c) 1999
@@ -109,7 +109,7 @@ A device specification containing a positive value here will only match
 if the device is in use as system console.
 (The console device selection in early system startup is not influenced.)
 This way, the console device can be connected to a known
-.Xr wskbd 4
+.Nm wskbd
 device instance.
 .Pp
 The
diff --git a/share/man/man4/wsmux.4 b/share/man/man4/wsmux.4
index 2986be64ce8..53e94cbff94 100644
--- a/share/man/man4/wsmux.4
+++ b/share/man/man4/wsmux.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsmux.4,v 1.8 2002/09/26 22:09:53 miod Exp $
+.\" $OpenBSD: wsmux.4,v 1.9 2003/06/06 10:29:41 jmc Exp $
 .\" $NetBSD: wsmux.4,v 1.2 1999/11/03 22:01:40 castor Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@ make it appear on the standard mouse mux.
 .Xr wsdisplay 4 ,
 .Xr wskbd 4 ,
 .Xr wsmouse 4 ,
-.Xr wsmoused 8 ,
 .Xr wsconscfg 8 ,
 .Xr wsconsctl 8 ,
-.Xr wsfontload 8
+.Xr wsfontload 8 ,
+.Xr wsmoused 8
diff --git a/share/man/man4/xf86.4 b/share/man/man4/xf86.4
index 78215336fda..4a65b73cc06 100644
--- a/share/man/man4/xf86.4
+++ b/share/man/man4/xf86.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xf86.4,v 1.5 2003/04/11 04:32:28 jmc Exp $
+.\"	$OpenBSD: xf86.4,v 1.6 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Matthieu Herrb
 .\" All rights reserved.
@@ -35,8 +35,8 @@
 .Cd "option APERTURE"
 .Sh DESCRIPTION
 On
-.Va alpha Ns ,
-.Va i386 Ns ,
+.Va alpha ,
+.Va i386 ,
 .Va macppc
 and
 .Va sparc64
@@ -65,7 +65,7 @@ are:
 .It 0
 the aperture driver is disabled.
 Opening it returns
-.Dv EPERM.
+.Dv EPERM .
 .It 1
 the aperture driver allows access to standard VGA framebuffer and BIOS.
 Access to
diff --git a/share/man/man4/yds.4 b/share/man/man4/yds.4
index 6c93fb03dcf..cde7098efaa 100644
--- a/share/man/man4/yds.4
+++ b/share/man/man4/yds.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yds.4,v 1.2 2002/09/26 22:09:53 miod Exp $
+.\"	$OpenBSD: yds.4,v 1.3 2003/06/06 10:29:41 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Aaron Campbell.
 .\" All rights reserved.
@@ -38,6 +38,12 @@ The
 .Nm
 driver supports Yamaha DS-XG based sound chips, as found in, e.g., many
 Sony Vaio notebooks.
+.Sh SEE ALSO
+.Xr ac97 4 ,
+.Xr audio 4 ,
+.Xr intro 4 ,
+.Xr opl 4 ,
+.Xr pci 4
 .Sh HISTORY
 The
 .Nm
@@ -45,9 +51,3 @@ driver first appeared in
 .Ox 2.9 .
 .Sh AUTHORS
 Kazuki Sakamoto and Minoura Makoto.
-.Sh SEE ALSO
-.Xr ac97 4 ,
-.Xr audio 4 ,
-.Xr intro 4 ,
-.Xr pci 4 ,
-.Xr opl 4