- section reorder

- some mdoc fixes

38 files changed, 703 insertions, 646 deletions

diff --git a/sbin/ancontrol/ancontrol.8 b/sbin/ancontrol/ancontrol.8
index 4583b72f7cd..a21cc256e6e 100644
--- a/sbin/ancontrol/ancontrol.8
+++ b/sbin/ancontrol/ancontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ancontrol.8,v 1.17 2003/01/29 16:53:36 jmc Exp $
+.\"	$OpenBSD: ancontrol.8,v 1.18 2003/06/03 13:16:07 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu> All rights reserved.
@@ -395,12 +395,6 @@ Therefore, all configured keys (up to four) must agree.
 .Xr hostname.if 5 ,
 .Xr ifconfig 8 ,
 .Xr wicontrol 8
-.Sh AUTHORS
-The
-.Nm
-command was written by Bill Paul <wpaul@ee.columbia.edu> and ported to
-.Ox
-by Michael Shalayeff <mickey@openbsd.org>.
 .Sh HISTORY
 The
 .Nm
@@ -408,6 +402,15 @@ command first appeared in
 .Fx 3.0
 and
 .Ox 2.7 .
+.Sh AUTHORS
+The
+.Nm
+command was written by
+.An Bill Paul Aq wpaul@ee.columbia.edu
+and ported to
+.Ox
+by
+.An Michael Shalayeff Aq mickey@openbsd.org .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
 and received frames as increasing.
diff --git a/sbin/atactl/atactl.8 b/sbin/atactl/atactl.8
index c2fb47f64f4..a8c7f9b35be 100644
--- a/sbin/atactl/atactl.8
+++ b/sbin/atactl/atactl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atactl.8,v 1.23 2003/03/12 20:12:36 deraadt Exp $
+.\"	$OpenBSD: atactl.8,v 1.24 2003/06/03 13:16:07 jmc Exp $
 .\"	$NetBSD: atactl.8,v 1.5 1999/02/24 18:49:14 jwise Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -296,7 +296,7 @@ command.
 .Em WARNING
 .br
 Be very careful while playing with these commands.
-Loss of the user and master passwords for the device will result 
+Loss of the user and master passwords for the device will result
 in an inaccessible device.
 .Pp
 .It Li smartenable
@@ -418,7 +418,7 @@ command.
 Enables the write cache on the specified device (if supported).
 This may increase performance, however data still in the device's cache at
 powerdown
-.Em may be lost.
+.Em may be lost .
 The
 .Xr wd 4
 driver performs a cache flush automatically before shutdown.
@@ -427,7 +427,6 @@ driver performs a cache flush automatically before shutdown.
 Extracts the records about issued ATA commands from the log buffer.
 The log buffer is cleared after extraction.
 .El
-.Pp
 .Sh EXAMPLES
 .Li # atactl /dev/wd0c identify
 .Pp
@@ -469,13 +468,6 @@ so even though disabling a feature works, enabling might not.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr wd 4
-.Sh AUTHORS
-The
-.Nm
-command was written by Ken Hornstein.
-It was based heavily on the scsictl command written by Jason R. Thorpe.
-Support for acoustic management, advanced power management, power-up in
-standby, read look-ahead and SMART was added by Wouter Slegers.
 .Sh HISTORY
 The
 .Nm
@@ -484,6 +476,13 @@ command first appeared in
 Support for acoustic management, advanced power management, power-up in
 standby, read look-ahead and SMART was added in
 .Ox 2.9 .
+.Sh AUTHORS
+The
+.Nm
+command was written by Ken Hornstein.
+It was based heavily on the scsictl command written by Jason R. Thorpe.
+Support for acoustic management, advanced power management, power-up in
+standby, read look-ahead and SMART was added by Wouter Slegers.
 .Sh BUGS
 The output from the
 .Li identify
diff --git a/sbin/brconfig/brconfig.8 b/sbin/brconfig/brconfig.8
index f80b17997c5..5ef2690939d 100644
--- a/sbin/brconfig/brconfig.8
+++ b/sbin/brconfig/brconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: brconfig.8,v 1.43 2003/06/02 18:44:35 jason Exp $
+.\"	$OpenBSD: brconfig.8,v 1.44 2003/06/03 13:16:07 jmc Exp $
 .\"
 .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -286,7 +286,7 @@ through fxp0 only to 5:4:3:2:1, and 5:4:3:2:1:0 can return frames through
 fxp0 to 0:1:2:3:4:5.
 All other traffic trying to go into and be sent from fxp0 will be blocked.
 .El
-.Sh "IPSEC BRIDGE"
+.Sh IPSEC BRIDGE
 The bridge can also be used to tunnel ethernet frames over IPv4 or
 IPv6 by using the
 .Xr gif 4
@@ -414,6 +414,11 @@ commands are used to add and delete span ports to and from a bridge.
 .Xr ifconfig 8 ,
 .Xr ipsecadm 8 ,
 .Xr isakmpd 8
+.Sh HISTORY
+The
+.Nm brconfig
+command first appeared in
+.Ox 2.5 .
 .Sh AUTHORS
 The
 .Nm
@@ -423,11 +428,6 @@ 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
-.Nm brconfig
-command first appeared in
-.Ox 2.5 .
 .Sh BUGS
 There are some rather special network interface chipsets which will
 not work in a bridge configuration.
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 849d1d16f6d..de14b78b47f 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ccdconfig.8,v 1.17 2003/02/01 16:29:52 jmc Exp $
+.\"	$OpenBSD: ccdconfig.8,v 1.18 2003/06/03 13:16:07 jmc Exp $
 .\"	$NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -147,6 +147,11 @@ argument is optional.
 # ccd           ileave  flags   component devices
 ccd0            16      none    /dev/sd2e /dev/sd3e
 .Ed
+.Sh FILES
+.Bl -tag -width /etc/ccd.conf -compact
+.It Pa /etc/ccd.conf
+default ccd configuration file
+.El
 .Sh EXAMPLES
 The following command, executed from the command line, would configure ccd0
 with 4 components (/dev/sd2e, /dev/sd3e, /dev/sd4e, /dev/sd5e), and an
@@ -154,11 +159,6 @@ interleave factor of 32 blocks.
 .Bd -unfilled -offset indent
 # ccdconfig ccd0 32 0 /dev/sd2e /dev/sd3e /dev/sd4e /dev/sd5e
 .Ed
-.Sh FILES
-.Bl -tag -width /etc/ccd.conf -compact
-.It Pa /etc/ccd.conf
-default ccd configuration file
-.El
 .Sh SEE ALSO
 .Xr ccd 4 ,
 .Xr rc 8
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 7629cc494fc..e3b53b43c32 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.51 2003/06/02 20:06:14 millert Exp $
+.\"	$OpenBSD: disklabel.8,v 1.52 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -218,7 +218,7 @@ Allow writing of the pack label area on the selected disk.
 .Pp
 The first form of the command (read) is used to examine the label on
 the named disk drive (e.g., sd0 or
-.Pa /dev/rsd0c Ns ).
+.Pa /dev/rsd0c ) .
 It will display all of the parameters associated with the drive
 and its partition layout.
 Unless the
@@ -509,6 +509,12 @@ with the
 .Fl e
 flag and paste any entries you want from the default label into the real
 one.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /etc/disktab
+.It Pa /usr/mdec/ Ns Em xx Ns boot
+.It Pa /usr/mdec/boot Ns Em xx
+.El
 .Sh EXAMPLES
 .Li # disklabel sd0
 .Pp
@@ -562,16 +568,6 @@ and installed both in-core and
 on-disk.
 The bootstrap code comes from the file
 .Pa /usr/mdec/newboot .
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /etc/disktab
-.It Pa /usr/mdec/ Ns Em xx Ns boot
-.It Pa /usr/mdec/boot Ns Em xx
-.El
-.Sh SEE ALSO
-.Xr disklabel 5 ,
-.Xr disktab 5 ,
-.Xr scan_ffs 8
 .Sh DIAGNOSTICS
 The kernel device drivers will not allow the size of a disk partition
 to be decreased or the offset of a partition to be changed while
@@ -611,6 +607,10 @@ or
 .Dv FS_BOOT ,
 .Nm
 will not install bootstrap code that overlaps it.
+.Sh SEE ALSO
+.Xr disklabel 5 ,
+.Xr disktab 5 ,
+.Xr scan_ffs 8
 .Sh NOTES
 On i386 machines,
 .Xr installboot 8
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 30652dcba5c..298c8e361ad 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dump.8,v 1.31 2003/04/09 04:17:21 jmc Exp $
+.\"	$OpenBSD: dump.8,v 1.32 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -363,13 +363,12 @@ argument of
 whilst a backup is in progress, statistics on the amount completed,
 current transfer rate, and estimated finished time, will be written
 to the standard error output.
-.Sh DIAGNOSTICS
-Many, and verbose.
-.Pp
-.Nm
-exits with zero status on success.
-Startup errors are indicated with an exit code of 1;
-abnormal termination is indicated with an exit code of 3.
+.Sh ENVIRONMENT
+.Bl -tag -width /etc/dumpdates
+.It Ev TAPE
+default tape device to use instead of
+.Pa /dev/rst0
+.El
 .Sh FILES
 .Bl -tag -width /etc/dumpdates -compact
 .It Pa /dev/rst0
@@ -384,12 +383,13 @@ dump table: file systems and frequency
 to find group
 .Em operator
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width /etc/dumpdates
-.It Ev TAPE
-default tape device to use instead of
-.Pa /dev/rst0
-.El
+.Sh DIAGNOSTICS
+Many, and verbose.
+.Pp
+.Nm
+exits with zero status on success.
+Startup errors are indicated with an exit code of 1;
+abnormal termination is indicated with an exit code of 3.
 .Sh SEE ALSO
 .Xr stty 1 ,
 .Xr fts 3 ,
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index c8615a5b12c..a0a0ae90466 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdisk.8,v 1.40 2003/06/03 01:13:19 weingart Exp $
+.\"	$OpenBSD: fdisk.8,v 1.41 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\" All rights reserved.
@@ -168,7 +168,7 @@ Note that this option will overwrite the NT disk signature, if present.
 .Pp
 The
 .Fl e
-flag is used to modify a partition table using an 
+flag is used to modify a partition table using an
 interactive edit mode of the
 .Nm
 program.
@@ -220,7 +220,8 @@ or in sector offsets and sizes.
 Change the partition
 identifier of the given partition table entry.
 This command is particularly useful for reassigning
-an existing partition to OpenBSD.
+an existing partition to
+.Ox .
 .It Em flag
 Make the given partition table entry bootable.
 Only one entry can be marked bootable.
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 9ea2668d934..8fd06cdf113 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsck_ffs.8,v 1.14 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: fsck_ffs.8,v 1.15 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: fsck_ffs.8,v 1.12 1996/09/23 16:18:34 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -313,7 +313,7 @@ are fully enumerated and explained in Appendix A of
 .Sh SEE ALSO
 .Xr fs 5 ,
 .Xr fstab 5 ,
-.Xr fsdb 8 ,
 .Xr fsck 8 ,
+.Xr fsdb 8 ,
 .Xr newfs 8 ,
 .Xr reboot 8
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index a826f5f5137..e35d232efe0 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -13,7 +13,7 @@
 .\" OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 .\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\"	$OpenBSD: fsirand.8,v 1.24 2003/06/03 01:52:40 millert Exp $
+.\"	$OpenBSD: fsirand.8,v 1.25 2003/06/03 13:16:08 jmc Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
@@ -75,19 +75,11 @@ is not marked as clean.
 Print the current generation numbers for all inodes instead of
 generating new ones.
 .El
-.Sh CAVEATS
-Since
-.Nm
-allocates enough memory to hold all the inodes in
-a given cylinder group, it may use a large amount
-of memory for large disks with few cylinder groups.
 .Sh SEE ALSO
 .Xr fs 5 ,
 .Xr fsck 8 ,
 .Xr newfs 8 ,
 .Xr reboot 8
-.Sh AUTHORS
-Todd C. Miller <Todd.Miller@courtesan.com>
 .Sh HISTORY
 The
 .Nm
@@ -96,3 +88,11 @@ This version of
 .Nm
 first appeared in
 .Ox 2.1 .
+.Sh AUTHORS
+.An Todd C. Miller Aq Todd.Miller@courtesan.com
+.Sh CAVEATS
+Since
+.Nm
+allocates enough memory to hold all the inodes in
+a given cylinder group, it may use a large amount
+of memory for large disks with few cylinder groups.
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index f0089ef9dd9..ea62f698c3e 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.65 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.66 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -396,7 +396,7 @@ using the specified
 The
 .Ar key
 can either be a string, a series of hexadecimal digits (preceded by
-.So 0x Sc Ns ),
+.So 0x Sc ) ,
 or a set of keys
 of the form
 .Ar n:k1,k2,k3,k4 ,
@@ -511,7 +511,6 @@ Set the
 frame type to be either 802.2, 802.2tr, 802.3, snap or Ethernet II.
 .El
 .Pp
-.Pp
 .Nm
 displays the current configuration for a network interface
 when no optional parameters are supplied.
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index c483fb613e6..cef3bb618fb 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: init.8,v 1.31 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: init.8,v 1.32 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -244,22 +244,6 @@ the login class
 .Dq default
 is used.
 No resource changes are made when entering single user mode.
-.Sh DIAGNOSTICS
-.Bl -diag
-.It "getty repeating too quickly on port %s, sleeping"
-A process being started to service a line is exiting quickly
-each time it is started.
-This is often caused by a ringing or noisy terminal line.
-.Em "Init will sleep for 10 seconds" ,
-.Em "then continue trying to start the process" .
-.Pp
-.It "some processes would not die; ps axl advised."
-A process
-is hung and could not be killed when the system was shutting down.
-This condition is usually caused by a process
-that is stuck in a device driver because of
-a persistent device error condition.
-.El
 .Sh FILES
 .Bl -tag -width /etc/rc.securelevel -compact
 .It Pa /dev/console
@@ -280,6 +264,22 @@ commands that run before the security level changes
 .It Pa /etc/rc.shutdown
 script run at shutdown time
 .El
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "getty repeating too quickly on port %s, sleeping"
+A process being started to service a line is exiting quickly
+each time it is started.
+This is often caused by a ringing or noisy terminal line.
+.Em "Init will sleep for 10 seconds" ,
+.Em "then continue trying to start the process" .
+.Pp
+.It "some processes would not die; ps axl advised."
+A process
+is hung and could not be killed when the system was shutting down.
+This condition is usually caused by a process
+that is stuck in a device driver because of
+a persistent device error condition.
+.El
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr login 1 ,
diff --git a/sbin/iopctl/iopctl.8 b/sbin/iopctl/iopctl.8
index cdea835cb89..6c75e55c3c7 100644
--- a/sbin/iopctl/iopctl.8
+++ b/sbin/iopctl/iopctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iopctl.8,v 1.4 2001/12/21 11:41:50 mpech Exp $
+.\"	$OpenBSD: iopctl.8,v 1.5 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: iopctl.8,v 1.4 2001/03/20 13:07:51 ad Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -90,6 +90,14 @@ control device for IOP unit
 .Xr ioprbs 4 ,
 .Xr iopsp 4 ,
 .Xr sd 4
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Nx 1.6 ,
+.Ox
+support was added in
+.Ox 3.0 .
 .Sh AUTHORS
 The
 .Nm
@@ -99,11 +107,3 @@ and ported to
 .Ox
 by
 .An Michael Shalayeff Aq mickey@openbsd.org .
-.Sh HISTORY
-The
-.Nm
-command first appeared in
-.Nx 1.6 ,
-.Ox
-support was added in
-.Ox 3.0 .
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index ad11fe770e3..d0e78539940 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.51 2003/05/10 21:13:41 jmc Exp $
+.\" $OpenBSD: isakmpd.8,v 1.52 2003/06/03 13:16:08 jmc Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -360,7 +360,6 @@ and named and stored after this easy formula:
 .It For UFQDN identities
 /etc/isakmpd/pubkeys/ufqdn/user@foo.bar.org
 .El
-.Pp
 .Ss The FIFO user interface
 When
 .Nm
@@ -429,19 +428,6 @@ Tear down the named connection, if active.
 .It Ic "T"
 Tear down all active connections.
 .El
-.Sh BUGS
-The
-.Fl P
-flag does not do what we document, rather it does nothing.
-.Sh CAVEATS
-When storing a trusted public key for an IPv6 identity, the
-.Em most efficient
-form of address representation, i.e "::" instead of ":0:0:0:",
-must be used or the matching will fail.
-.Nm
-uses the output from
-.Xr getnameinfo 3
-for the address-to-name translation.
 .Sh FILES
 .Bl -tag -width /etc/isakmpd/private/local.
 .It Pa /etc/isakmpd/ca/
@@ -506,3 +492,16 @@ and
 .%T RFC 2409 .
 This implementation was done 1998 by Niklas Hallqvist and Niels Provos,
 sponsored by Ericsson Radio Systems.
+.Sh CAVEATS
+When storing a trusted public key for an IPv6 identity, the
+.Em most efficient
+form of address representation, i.e "::" instead of ":0:0:0:",
+must be used or the matching will fail.
+.Nm
+uses the output from
+.Xr getnameinfo 3
+for the address-to-name translation.
+.Sh BUGS
+The
+.Fl P
+flag does not do what we document, rather it does nothing.
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 50166376e2a..5b7141cf5d3 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.79 2003/05/17 17:26:40 jmc Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.80 2003/06/03 13:16:08 jmc Exp $
 .\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -692,6 +692,17 @@ Currently this can be:
 [user@foo.bar.org]
 .El
 .El
+.Sh FILES
+.Bl -tag -width /etc/isakmpd/isakmpd.conf
+.It Pa /etc/isakmpd/isakmpd.conf
+The default
+.Nm isakmpd
+configuration file.
+.It Pa /usr/share/ipsec/isakmpd/
+A directory containing some sample
+.Nm isakmpd
+configuration files.
+.El
 .Sh EXAMPLES
 An example of a configuration file:
 .Pp
@@ -1044,17 +1055,6 @@ LIFE_DURATION=		3600,1800:7200
 LIFE_TYPE=		KILOBYTES
 LIFE_DURATION=		1000,768:1536
 .Ed
-.Sh FILES
-.Bl -tag -width /etc/isakmpd/isakmpd.conf
-.It Pa /etc/isakmpd/isakmpd.conf
-The default
-.Nm isakmpd
-configuration file.
-.It Pa /usr/share/ipsec/isakmpd/
-A directory containing some sample
-.Nm isakmpd
-configuration files.
-.El
 .Sh SEE ALSO
 .Xr keynote 1 ,
 .Xr ipsec 4 ,
diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index cf72784820b..73d91850c2d 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.30 2003/03/06 20:29:24 jmc Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.31 2003/06/03 13:16:08 jmc Exp $
 .\" $EOM: isakmpd.policy.5,v 1.24 2000/11/23 12:55:25 niklas Exp $
 .\"
 .\" Copyright (c) 1999-2001, Angelos D. Keromytis.  All rights reserved.
@@ -495,6 +495,17 @@ Set to the UTC date/time, in YYYYMMDDHHmmSS format.
 .It LocalTimeOfDay
 Set to the local date/time, in YYYYMMDDHHmmSS format.
 .El
+.Sh FILES
+.Bl -tag -width /etc/isakmpd/isakmpd.policy
+.It Pa /etc/isakmpd/isakmpd.policy
+The default
+.Nm isakmpd
+policy configuration file.
+.It Pa /usr/share/ipsec/isakmpd/policy
+A sample
+.Nm isakmpd
+policy configuration file.
+.El
 .Sh EXAMPLES
 .Bd -literal
     Authorizer: "POLICY"
@@ -614,21 +625,10 @@ Signature: "sig-x509-sha1-base64:ql+vrUxv14DcBOQHR2jsbXayq6T\\
             mkdudZ0wjgeTLMI2NI4GibMMsToakOKMex/0q4cpdpln3DKcQ\\
             IcjzRv4khDws69FT3QfELjcpShvbLrXmh1Z00OFmxjyqDw="
 .Ed
-.Sh BUGS
-A more sane way of expressing IPv6 address ranges is needed.
-.Sh FILES
-.Bl -tag -width /etc/isakmpd/isakmpd.policy
-.It Pa /etc/isakmpd/isakmpd.policy
-The default
-.Nm isakmpd
-policy configuration file.
-.It Pa /usr/share/ipsec/isakmpd/policy
-A sample
-.Nm isakmpd
-policy configuration file.
-.El
 .Sh SEE ALSO
 .Xr ipsec 4 ,
 .Xr keynote 4 ,
 .Xr keynote 5 ,
 .Xr isakmpd 8
+.Sh BUGS
+A more sane way of expressing IPv6 address ranges is needed.
diff --git a/sbin/lmccontrol/lmccontrol.8 b/sbin/lmccontrol/lmccontrol.8
index b626b8d62c0..1349eac1020 100644
--- a/sbin/lmccontrol/lmccontrol.8
+++ b/sbin/lmccontrol/lmccontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lmccontrol.8,v 1.15 2003/03/12 20:12:36 deraadt Exp $
+.\"	$OpenBSD: lmccontrol.8,v 1.16 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright (c) 1997-1999 LAN Media Corporation (LMC)
 .\" All rights reserved.  www.lanmedia.com
@@ -122,7 +122,6 @@ To set a SSI card for a speed of 2048000 bits/sec with HDLC keepalive off,
 one could use:
 .Pp
 .Li # lmccontrol lmc0 -l 2048000 -K
-.Pp
 .Sh SEE ALSO
 .Xr lmc 4 ,
 .Xr sppp 4 ,
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index eb02fabe132..16b114ba0f3 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modunload.8,v 1.11 2003/01/18 23:30:20 deraadt Exp $
+.\"	$OpenBSD: modunload.8,v 1.12 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: modunload.8,v 1.3 1995/03/18 14:56:49 cgd Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -75,4 +75,4 @@ command was designed to be similar in functionality
 to the corresponding command in
 .Tn "SunOS 4.1.3" .
 .Sh AUTHORS
-Terrence R. Lambert <terry@cs.weber.edu>
+.An Terrence R. Lambert terry@cs.weber.edu
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 40aa8fc54a2..303e66cfa74 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.41 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: mount.8,v 1.42 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -302,6 +302,11 @@ For instance, the options specific to Berkeley
 Fast File Systems are described in the
 .Xr mount_ffs 8
 manual page.
+.Sh FILES
+.Bl -tag -width /etc/fstab -compact
+.It Pa /etc/fstab
+file system table
+.El
 .Sh EXAMPLES
 .Bd -literal
 .Pp
@@ -312,11 +317,6 @@ manual page.
 .Li # mount host:/path/name /mnt/nfs
 .Pp
 .Ed
-.Sh FILES
-.Bl -tag -width /etc/fstab -compact
-.It Pa /etc/fstab
-file system table
-.El
 .Sh SEE ALSO
 .Xr mount 2 ,
 .Xr fstab 5 ,
diff --git a/sbin/mount_kernfs/mount_kernfs.8 b/sbin/mount_kernfs/mount_kernfs.8
index 062b106ed00..2a21bbcea7f 100644
--- a/sbin/mount_kernfs/mount_kernfs.8
+++ b/sbin/mount_kernfs/mount_kernfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_kernfs.8,v 1.19 2003/06/02 20:06:15 millert Exp $
+.\"	$OpenBSD: mount_kernfs.8,v 1.20 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: mount_kernfs.8,v 1.6 1995/03/18 14:57:24 cgd Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -135,7 +135,8 @@ OS type for this kernel ("OpenBSD").
 .It Pa osrelease
 OS release number.
 .It Pa osrev
-OS revision number (BSD from <sys/param.h>).
+OS revision number (BSD from
+.Aq Pa sys/param.h ) .
 .It Pa pagesize
 Machine pagesize (decimal ASCII).
 .It Pa posix
diff --git a/sbin/mount_procfs/mount_procfs.8 b/sbin/mount_procfs/mount_procfs.8
index e12f7b59581..65ea293a635 100644
--- a/sbin/mount_procfs/mount_procfs.8
+++ b/sbin/mount_procfs/mount_procfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_procfs.8,v 1.20 2003/06/02 20:06:16 millert Exp $
+.\"	$OpenBSD: mount_procfs.8,v 1.21 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: mount_procfs.8,v 1.6 1995/03/18 14:58:10 cgd Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -138,14 +138,14 @@ Allows read and write access to the process's register set.
 This file contains a binary data structure
 .Dv "struct regs"
 defined in
-.Pa <machine/reg.h> .
+.Aq Pa machine/reg.h .
 .Pa regs
 can only be written when the process is stopped.
 .It Pa fpregs
 The floating point registers as defined by
 .Dv "struct fpregs"
 in
-.Pa <machine/reg.h> .
+.Aq Pa machine/reg.h .
 .Pa fpregs
 is only implemented on machines which have distinct general
 purpose and floating point register sets.
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index ff3d43b1c2c..8122c2482ca 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_umap.8,v 1.18 2003/06/02 20:06:16 millert Exp $
+.\"	$OpenBSD: mount_umap.8,v 1.19 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: mount_umap.8,v 1.4 1996/03/05 02:36:42 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -120,10 +120,6 @@ will refuse to map the subtree if the ownership or permissions on
 these files are improper.
 It will also balk if the count of mappings
 in the first line of the map files is not correct.
-.Pp
-.Sh BUGS
-It is not meant for production use.
-The implementation is not very sophisticated.
 .Sh SEE ALSO
 .Xr mount 2 ,
 .Xr mount 8 ,
@@ -133,3 +129,6 @@ The
 .Nm
 utility first appeared in
 .Bx 4.4 .
+.Sh BUGS
+It is not meant for production use.
+The implementation is not very sophisticated.
diff --git a/sbin/ncheck_ffs/ncheck_ffs.8 b/sbin/ncheck_ffs/ncheck_ffs.8
index cc860f789fe..9b9275a17fc 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.8
+++ b/sbin/ncheck_ffs/ncheck_ffs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ncheck_ffs.8,v 1.17 2003/03/06 09:47:18 hugh Exp $
+.\"	$OpenBSD: ncheck_ffs.8,v 1.18 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
 .\" All rights reserved.
@@ -60,23 +60,41 @@ Print the inode number.
 .It Cm \eP
 Print the pathname to the file using the current inode number.
 .It Cm \ee
-Print an <escape> character.
+Print an
+.Aq escape
+character.
 .It Cm \ea
-Print a <bell> character.
+Print a
+.Aq bell
+character.
 .It Cm \eb
-Print a <backspace> character.
+Print a
+.Aq backspace
+character.
 .It Cm \ef
-Print a <form-feed> character.
+Print a
+.Aq form-feed
+character.
 .It Cm \en
-Print a <new-line> character.
+Print a
+.Aq new-line
+character.
 .It Cm \er
-Print a <carriage return> character.
+Print a
+.Aq carriage return
+character.
 .It Cm \et
-Print a <tab> character.
+Print a
+.Aq tab
+character.
 .It Cm \ev
-Print a <vertical tab> character.
+Print a
+.Aq vertical tab
+character.
 .It Cm \e\'
-Print a <single quote> character.
+Print a
+.Aq single quote
+character.
 .It Cm \e\e
 Print a backslash character.
 .It Cm \e Ns Ar 0
@@ -118,4 +136,4 @@ command was designed to be similar in functionality to the corresponding
 command in
 .Tn "SunOS 4.1.3" .
 .Sh AUTHORS
-Thorsten Lockert <tholo@sigmasoft.com>
+.An Thorsten Lockert Aq tholo@sigmasoft.com
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 72702203693..0ad227a6ad1 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newfs_msdos.8,v 1.19 2003/02/07 07:45:13 jmc Exp $
+.\"	$OpenBSD: newfs_msdos.8,v 1.20 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Robert Nordier
 .\" All rights reserved.
@@ -168,13 +168,13 @@ Create a file system, using default parameters, on /dev/rwd0i.
 Create a standard 1.44M file system, with volume label "foo", on
 /dev/rfd0c.
 .Dl newfs_msdos -f 1440 -L foo fd0c
+.Sh DIAGNOSTICS
+Exit status is 0 on success and 1 on error.
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
 .Xr newfs 8
-.Sh DIAGNOSTICS
-Exit status is 0 on success and 1 on error.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/pdisk/pdisk.8 b/sbin/pdisk/pdisk.8
index 1112731d1ac..70430d6bae2 100644
--- a/sbin/pdisk/pdisk.8
+++ b/sbin/pdisk/pdisk.8
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: pdisk.8,v 1.11 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright 1996,1997,1998 by Apple Computer, Inc.
 .\"              All Rights Reserved
@@ -17,7 +18,7 @@
 .\" LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
 .\" NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\" 
+.\"
 .Dd September 26, 1997
 .Dt PDISK 8 macppc
 .Os
@@ -145,7 +146,7 @@ The
 The first argument is the base address (in blocks) of the partition.
 Besides a raw number, you can also specify a partition number followed
 by the letter 'p' to indicate that the first block of the new partition should
-be the same as the first block of that existing free  space partition.
+be the same as the first block of that existing free space partition.
 The second argument is the length of the partition in blocks.
 This can be a raw number or can be a partition number followed by the
 letter 'p' to use the size of that partition or can be a number followed
@@ -155,7 +156,8 @@ respectively.
 The last argument is the name of the partition.
 This can be a single word without quotes, or a string surrounded by
 single or double quotes.
-The type of the created partition is the correct type for OpenBSD.
+The type of the created partition is the correct type for
+.Ox .
 .Pp
 The
 .Em C
@@ -179,7 +181,8 @@ The index numbers are constrained to be a contiguous sequence.
 The
 .Em t
 (change type) command allows the type of an existing partition to be changed.
-Examples of valid partition types are: Apple_Free, Apple_HFS, and OpenBSD.
+Examples of valid partition types are: Apple_Free, Apple_HFS, and
+.Ox .
 .Pp
 The
 .Em i
@@ -196,6 +199,11 @@ disk and the kernel where
 .Fl c
 .Ar device
 must be issued to cause the kernel to reinterpret the new label.
+.Sh SEE ALSO
+.Xr disklabel 8 ,
+.Xr fdisk 8
+.Sh AUTHORS
+.An Eryk Vershen Aq eryk@apple.com .
 .Sh BUGS
 Some people believe there should really be just one disk partitioning utility.
 .Pp
@@ -203,8 +211,3 @@ Some people believe there should really be just one disk partitioning utility.
 should be able to create HFS partitions that work.
 .Pp
 Even more help should be available during user input.
-.Sh SEE ALSO
-.Xr disklabel 8 ,
-.Xr fdisk 8
-.Sh AUTHORS
-.An Eryk Vershen Aq eryk@apple.com .
diff --git a/sbin/pflogd/pflogd.8 b/sbin/pflogd/pflogd.8
index 0e2c020065d..ab632593ac7 100644
--- a/sbin/pflogd/pflogd.8
+++ b/sbin/pflogd/pflogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pflogd.8,v 1.21 2003/03/11 07:10:04 david Exp $
+.\"	$OpenBSD: pflogd.8,v 1.22 2003/06/03 13:16:08 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Can Erkin Acar.  All rights reserved.
 .\"
@@ -102,6 +102,14 @@ Other file parsers may desire a higher snaplen.
 Selects which packets will be dumped, using the regular language of
 .Xr tcpdump 8 .
 .El
+.Sh FILES
+.Bl -tag -width /var/run/pflogd.pid -compact
+.It Pa /var/run/pflogd.pid
+Process ID of the currently running
+.Nm pflogd .
+.It Pa /var/log/pflog
+Default log file.
+.El
 .Sh EXAMPLES
 Log specific tcp packets to a different log file with a large snaplen
 (useful with a log-all rule to dump complete sessions)
@@ -155,14 +163,6 @@ the wi0 interface:
 .Bd -literal -offset indent
 # tcpdump -n -e -ttt -i pflog0 inbound and action block and on wi0
 .Ed
-.Sh FILES
-.Bl -tag -width /var/run/pflogd.pid -compact
-.It Pa /var/run/pflogd.pid
-Process ID of the currently running
-.Nm pflogd .
-.It Pa /var/log/pflog
-Default log file.
-.El
 .Sh SEE ALSO
 .Xr pcap 3 ,
 .Xr pf 4 ,
@@ -170,10 +170,10 @@ Default log file.
 .Xr pf.conf 5 ,
 .Xr newsyslog 8 ,
 .Xr tcpdump 8
-.Sh AUTHORS
-Can Erkin Acar
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Ox 3.0 .
+.Sh AUTHORS
+Can Erkin Acar
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index b205526c1e4..8a611d57d48 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping.8,v 1.27 2003/06/02 20:06:16 millert Exp $
+.\"	$OpenBSD: ping.8,v 1.28 2003/06/03 13:16:08 jmc Exp $
 .\"	$NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -346,8 +346,7 @@ Set it to 255; this is what current Berkeley Unix systems do.
 In this case the
 .Tn TTL
 value in the received packet will be 255 minus the
-number of routers in the path
-.Xr from
+number of routers in the path from
 the remote system to the pinging host.
 .It
 Set it to some other value.
@@ -358,6 +357,16 @@ packets that they use for
 packets, for example either 30 or 60.
 Others may use completely wild values.
 .El
+.Sh SEE ALSO
+.Xr netstat 1 ,
+.Xr ifconfig 8 ,
+.Xr routed 8 ,
+.Xr spray 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 .
 .Sh BUGS
 Many hosts and gateways ignore the
 .Tn RECORD_ROUTE
@@ -371,13 +380,3 @@ There's not much that can be done about this, however.
 .Pp
 Flood pinging is not recommended in general, and flood pinging the
 broadcast address should only be done under very controlled conditions.
-.Sh SEE ALSO
-.Xr netstat 1 ,
-.Xr ifconfig 8 ,
-.Xr routed 8 ,
-.Xr spray 8
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.3 .
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 565daecf9c6..2f9dcf944f1 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping6.8,v 1.25 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: ping6.8,v 1.26 2003/06/03 13:16:08 jmc Exp $
 .\"	$KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -386,7 +386,7 @@ You can then examine this file for repeated patterns that you can test
 using the
 .Fl p
 option of
-.Nm Ns .
+.Nm ping6 .
 .Sh RETURN VALUES
 .Nm
 returns 0 on success (the host is alive),
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index 66e9eca8625..36ac080ffe8 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.29 2003/04/02 19:00:26 jmc Exp $
+.\"	$OpenBSD: raidctl.8,v 1.30 2003/06/03 13:16:09 jmc Exp $
 .\"     $NetBSD: raidctl.8,v 1.24 2001/07/10 01:30:52 lukem Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -83,7 +83,8 @@ is the user-land control program for
 the RAIDframe disk device.
 .Nm
 is primarily used to dynamically configure and unconfigure RAIDframe disk
-devices.  For more information about the RAIDframe disk device, see
+devices.
+For more information about the RAIDframe disk device, see
 .Xr raid 4 .
 .Pp
 This document assumes the reader has at least rudimentary knowledge of
@@ -99,9 +100,8 @@ may be either the full name of the device, e.g.
 or just simply raid0 (for
 .Pa /dev/rraid0c ) .
 .Pp
-For several commands (
-.Fl BGipPsSu
-),
+For several commands
+.Pq Fl BGipPsSu ,
 .Nm
 can accept the word
 .Ic all
@@ -126,28 +126,30 @@ Add
 as a hot spare for the device
 .Ar dev .
 .It Fl A Ic yes Ar dev
-Make the RAID set auto-configurable.  The RAID set will be
-automatically configured at boot
-.Ar before
+Make the RAID set auto-configurable.
+The RAID set will be automatically configured at boot
+.Em before
 the root file system is
-mounted.  Note that all components of the set must be of type RAID in the
-disklabel.
+mounted.
+Note that all components of the set must be of type RAID in the disklabel.
 .It Fl A Ic no Ar dev
 Turn off auto-configuration for the RAID set.
 .It Fl A Ic root Ar dev
 Make the RAID set auto-configurable, and also mark the set as being
-eligible to contain the root partition.  A RAID set configured this way
-will
-.Ar override
-the use of the boot disk as the root device.  All components of the
-set must be of type RAID in the disklabel.  Note that the kernel being
-booted must currently reside on a non-RAID set and, in order to have the root
-file system correctly mounted from it, the RAID set must have its
+eligible to contain the root partition.
+A RAID set configured this way will
+.Em override
+the use of the boot disk as the root device.
+All components of the set must be of type RAID in the disklabel.
+Note that the kernel being booted must currently reside on a non-RAID set and,
+in order to have the root file system correctly mounted from it,
+the RAID set must have its
 .Sq a
 partition (aka raid[0..n]a) set up.
 .It Fl B Ar dev
 Initiate a copyback of reconstructed data from a spare disk to
-its original disk.  This is performed after a component has failed,
+its original disk.
+This is performed after a component has failed,
 and the failed drive has been reconstructed onto a spare drive.
 .It Fl c Ar config_file Ar dev
 Configure the RAIDframe device
@@ -160,8 +162,8 @@ is given later.
 .It Fl C Ar config_file Ar dev
 As for
 .Fl c ,
-but forces the configuration to take place.  This is required the
-first time a RAID set is configured.
+but forces the configuration to take place.
+This is required the first time a RAID set is configured.
 .It Fl f Ar component Ar dev
 This marks the specified
 .Ar component
@@ -171,8 +173,9 @@ component.
 Fails the specified
 .Ar component
 of the device, and immediately begin a reconstruction of the failed
-disk onto an available hot spare.  This is one of the mechanisms used to start
-the reconstruction process if a component does have a hardware failure.
+disk onto an available hot spare.
+This is one of the mechanisms used to start the reconstruction process
+if a component does have a hardware failure.
 .It Fl g Ar component Ar dev
 Get the component label for the specified component.
 .It Fl G Ar dev
@@ -183,25 +186,28 @@ use with
 or
 .Fl C .
 .It Fl i Ar dev
-Initialize the RAID device.  In particular, (re-write) the parity on
-the selected device.  This
-.Ar MUST
+Initialize the RAID device.
+In particular, (re-write) the parity on the selected device.
+This
+.Em MUST
 be done for
-.Ar all
+.Em all
 RAID sets before the RAID device is labeled and before
 file systems are created on the RAID device.
 .It Fl I Ar serial_number Ar dev
 Initialize the component labels on each component of the device.
 .Ar serial_number
 is used as one of the keys in determining whether a
-particular set of components belong to the same RAID set.  While not
-strictly enforced, different serial numbers should be used for
-different RAID sets.  This step
-.Ar MUST
+particular set of components belong to the same RAID set.
+While not strictly enforced, different serial numbers should be used for
+different RAID sets.
+This step
+.Em MUST
 be performed when a new RAID set is created.
 .It Fl p Ar dev
-Check the status of the parity on the RAID set.  Displays a status
-message, and returns successfully if the parity is up-to-date.
+Check the status of the parity on the RAID set.
+Displays a status message, and returns successfully if the parity
+is up-to-date.
 .It Fl P Ar dev
 Check the status of the parity on the RAID set, and initialize
 (re-write) the parity if the parity is not known to be up-to-date.
@@ -224,46 +230,49 @@ Display the status of the RAIDframe device for each of the components
 and spares.
 .It Fl S Ar dev
 Check the status of parity re-writing, component reconstruction, and
-component copyback.  The output indicates the amount of progress
-achieved in each of these areas.
+component copyback.
+The output indicates the amount of progress achieved in each of these areas.
 .It Fl u Ar dev
 Unconfigure the RAIDframe device.
 .It Fl v
-Be more verbose.  For operations such as reconstructions, parity
-re-writing, and copybacks, provide a progress indicator.
+Be more verbose.
+For operations such as reconstructions, parity re-writing,
+and copybacks, provide a progress indicator.
 .El
-.Pp
 .Ss Configuration file
 The format of the configuration file is complex, and
-only an abbreviated treatment is given here.  In the configuration
-files, a
+only an abbreviated treatment is given here.
+In the configuration files, a
 .Sq #
 indicates the beginning of a comment.
 .Pp
 There are 4 required sections of a configuration file, and 2
-optional sections.  Each section begins with a
+optional sections.
+Each section begins with a
 .Sq START ,
 followed by
 the section name, and the configuration parameters associated with that
-section.  The first section is the
+section.
+The first section is the
 .Sq array
 section, and it specifies
-the number of rows, columns, and spare disks in the RAID set.  For
-example:
+the number of rows, columns, and spare disks in the RAID set.
+For example:
 .Bd -unfilled -offset indent
 START array
 1 3 0
 .Ed
 .Pp
-indicates an array with 1 row, 3 columns, and 0 spare disks.  Note
-that although multi-dimensional arrays may be specified, they are
-.Ar NOT
+indicates an array with 1 row, 3 columns, and 0 spare disks.
+Note that although multi-dimensional arrays may be specified, they are
+.Em NOT
 supported in the driver.
 .Pp
 The second section, the
 .Sq disks
 section, specifies the actual
-components of the device.  For example:
+components of the device.
+For example:
 .Bd -unfilled -offset indent
 START disks
 /dev/sd0e
@@ -271,20 +280,21 @@ START disks
 /dev/sd2e
 .Ed
 .Pp
-specifies the three component disks to be used in the RAID device.  If
-any of the specified drives cannot be found when the RAID device is
+specifies the three component disks to be used in the RAID device.
+If any of the specified drives cannot be found when the RAID device is
 configured, then they will be marked as
 .Sq failed ,
 and the system will
-operate in degraded mode.  Note that it is
-.Ar imperative
+operate in degraded mode.
+Note that it is
+.Em imperative
 that the order of the components in the configuration file does not
-change between configurations of a RAID device.  Changing the order
-of the components will result in data loss if the set is configured
-with the
+change between configurations of a RAID device.
+Changing the order of the components will result in data loss if the set
+is configured with the
 .Fl C
-option.  In normal circumstances, the RAID set will not configure if
-only
+option.
+In normal circumstances, the RAID set will not configure if only
 .Fl c
 is specified, and the components are out-of-order.
 .Pp
@@ -295,7 +305,8 @@ present, specifies the devices to be used as
 .Sq hot spares
 -- devices
 which are on-line, but are not actively used by the RAID driver unless
-one of the main components fail.  A simple
+one of the main components fail.
+A simple
 .Sq spare
 section might be:
 .Bd -unfilled -offset indent
@@ -303,18 +314,19 @@ START spare
 /dev/sd3e
 .Ed
 .Pp
-for a configuration with a single spare component.  If no spare drives
-are to be used in the configuration, then the
+for a configuration with a single spare component.
+If no spare drives are to be used in the configuration, then the
 .Sq spare
 section may be omitted.
 .Pp
 The next section is the
 .Sq layout
-section.  This section describes the
-general layout parameters for the RAID device, and provides such
-information as sectors per stripe unit, stripe units per parity unit,
-stripe units per reconstruction unit, and the parity configuration to
-use.  This section might look like:
+section.
+This section describes the general layout parameters for the RAID device,
+and provides such information as sectors per stripe unit,
+stripe units per parity unit, stripe units per reconstruction unit,
+and the parity configuration to use.
+This section might look like:
 .Bd -unfilled -offset indent
 START layout
 # sectPerSU SUsPerParityUnit SUsPerReconUnit RAID_level
@@ -323,26 +335,31 @@ START layout
 .Pp
 The sectors per stripe unit specifies, in blocks, the interleave
 factor; i.e. the number of contiguous sectors to be written to each
-component for a single stripe.  Appropriate selection of this value
-(32 in this example) is the subject of much research in RAID
-architectures.  The stripe units per parity unit and
-stripe units per reconstruction unit are normally each set to 1.
+component for a single stripe.
+Appropriate selection of this value (32 in this example) is the subject
+of much research in RAID architectures.
+The stripe units per parity unit and stripe units per reconstruction unit
+are normally each set to 1.
 While certain values above 1 are permitted, a discussion of valid
 values and the consequences of using anything other than 1 are outside
-the scope of this document.  The last value in this section (5 in this
-example) indicates the parity configuration desired.  Valid entries
-include:
+the scope of this document.
+The last value in this section (5 in this example) indicates the
+parity configuration desired.
+Valid entries include:
 .Bl -tag -width inde
 .It 0
-RAID level 0.  No parity, only simple striping.
+RAID level 0.
+No parity, only simple striping.
 .It 1
-RAID level 1.  Mirroring.  The parity is the mirror.
+RAID level 1.
+Mirroring.
+The parity is the mirror.
 .It 4
-RAID level 4.  Striping across components, with parity stored on the
-last component.
+RAID level 4.
+Striping across components, with parity stored on the last component.
 .It 5
-RAID level 5.  Striping across components, parity distributed across
-all components.
+RAID level 5.
+Striping across components, parity distributed across all components.
 .El
 .Pp
 There are other valid entries here, including those for Even-Odd
@@ -353,8 +370,8 @@ those parity operations has not been tested with
 .Pp
 The next required section is the
 .Sq queue
-section.  This is most often
-specified as:
+section.
+This is most often specified as:
 .Bd -unfilled -offset indent
 START queue
 fifo 100
@@ -367,24 +384,22 @@ is beyond the scope of this document.
 .Pp
 The final section, the
 .Sq debug
-section, is optional.  For more details
-on this the reader is referred to the RAIDframe documentation
-discussed in the
+section, is optional.
+For more details on this the reader is referred to the RAIDframe
+documentation discussed in the
 .Sx HISTORY
 section.
-
 See
 .Sx EXAMPLES
 for a more complete configuration file example.
-
 .Sh EXAMPLES
-
 It is highly recommended that before using the RAID driver for real
 file systems that the system administrator(s) become quite familiar
 with the use of
 .Nm raidctl ,
 and that they understand how the component reconstruction process
-works.  The examples in this section will focus on configuring a
+works.
+The examples in this section will focus on configuring a
 number of different RAID sets of varying degrees of redundancy.
 By working through these examples, administrators should be able to
 develop a good feel for how to configure a RAID set, and how to
@@ -396,14 +411,13 @@ will be used to denote the RAID device.
 .Sq Pa /dev/rraid0c
 may be used in place of
 .Sq raid0 .
-.Pp
 .Ss Initialization and Configuration
 The initial step in configuring a RAID set is to identify the components
-that will be used in the RAID set.  All components should be the same
-size.  Each component should have a disklabel type of
+that will be used in the RAID set.
+All components should be the same size.
+Each component should have a disklabel type of
 .Dv FS_RAID ,
-and a typical disklabel entry for a RAID component
-might look like:
+and a typical disklabel entry for a RAID component might look like:
 .Bd -unfilled -offset indent
 f:  1800000  200495     RAID              # (Cyl.  405*- 4041*)
 .Ed
@@ -413,8 +427,9 @@ While
 (e.g. 4.2BSD) will also work as the component type, the type
 .Dv FS_RAID
 (e.g. RAID) is preferred for RAIDframe use, as it is required for
-features such as auto-configuration.  As part of the initial
-configuration of each RAID set, each component will be given a
+features such as auto-configuration.
+As part of the initial configuration of each RAID set, each component
+will be given a
 .Sq component label .
 A
 .Sq component label
@@ -422,18 +437,21 @@ contains important information about the component, including a
 user-specified serial number, the row and column of that component in
 the RAID set, the redundancy level of the RAID set, a 'modification
 counter', and whether the parity information (if any) on that
-component is known to be correct.  Component labels are an integral
-part of the RAID set, since they are used to ensure that components
-are configured in the correct order, and used to keep track of other
-vital information about the RAID set.  Component labels are also
-required for the auto-detection and auto-configuration of RAID sets at
-boot time.  For a component label to be considered valid, that
-particular component label must be in agreement with the other
-component labels in the set.  For example, the serial number,
+component is known to be correct.
+Component labels are an integral part of the RAID set, since they are used
+to ensure that components are configured in the correct order, and used
+to keep track of other vital information about the RAID set.
+Component labels are also required for the auto-detection and
+auto-configuration of RAID sets at boot time.
+For a component label to be considered valid, that particular component label
+must be in agreement with the other component labels in the set.
+For example, the serial number,
 .Sq modification counter ,
 number of rows and number of columns must all
-be in agreement.  If any of these are different, then the component is
-not considered to be part of the set.  See
+be in agreement.
+If any of these are different, then the component is not considered to be
+part of the set.
+See
 .Xr raid 4
 for more information about component labels.
 .Pp
@@ -442,8 +460,8 @@ appropriate labels,
 .Nm
 is then used to configure the
 .Xr raid 4
-device.  To configure the device, a configuration
-file which looks something like:
+device.
+To configure the device, a configuration file which looks something like:
 .Bd -unfilled -offset indent
 START array
 # numRow numCol numSpare
@@ -465,8 +483,9 @@ START queue
 fifo 100
 .Ed
 .Pp
-is created in a file.  The above configuration file specifies a RAID 5
-set consisting of the components
+is created in a file.
+The above configuration file specifies a RAID 5 set consisting of
+the components
 .Pa /dev/sd1e , /dev/sd2e ,
 and
 .Pa /dev/sd3e ,
@@ -475,8 +494,8 @@ with
 available as a
 .Sq hot spare
 in case one of
-the three main drives should fail. A RAID 0 set would be specified in
-a similar way:
+the three main drives should fail.
+A RAID 0 set would be specified in a similar way:
 .Bd -unfilled -offset indent
 START array
 # numRow numCol numSpare
@@ -500,9 +519,9 @@ In this case, devices
 .Pa /dev/sd10e , /dev/sd11e , /dev/sd12e ,
 and
 .Pa /dev/sd13e
-are the components that make up this RAID set.  Note that there are no
-hot spares for a RAID 0 set, since there is no way to recover data if
-any of the components fail.
+are the components that make up this RAID set.
+Note that there are no hot spares for a RAID 0 set, since there is no way
+to recover data if any of the components fail.
 .Pp
 For a RAID 1 (mirror) set, the following configuration might be used:
 .Bd -unfilled -offset indent
@@ -527,11 +546,11 @@ In this case,
 and
 .Pa /dev/sd21e
 are the two components of the
-mirror set.  While no hot spares have been specified in this
-configuration, they easily could be, just as they were specified in
-the RAID 5 case above.  Note as well that RAID 1 sets are currently
-limited to only 2 components.  At present, n-way mirroring is not
-possible.
+mirror set.
+While no hot spares have been specified in this configuration,
+they easily could be, just as they were specified in the RAID 5 case above.
+Note as well that RAID 1 sets are currently limited to only 2 components.
+At present, n-way mirroring is not possible.
 .Pp
 The first time a RAID set is configured, the
 .Fl C
@@ -542,16 +561,19 @@ option must be used:
 .Pp
 where
 .Sq raid0.conf
-is the name of the RAID configuration file.  The
+is the name of the RAID configuration file.
+The
 .Fl C
 forces the configuration to succeed, even if any of the component
-labels are incorrect.  The
+labels are incorrect.
+The
 .Fl C
 option should not be used lightly in
 situations other than initial configurations, as if
 the system is refusing to configure a RAID set, there is probably a
-very good reason for it.  After the initial configuration is done (and
-appropriate component labels are added with the
+very good reason for it.
+After the initial configuration is done (and appropriate component labels
+are added with the
 .Fl I
 option) then raid0 can be configured normally with:
 .Bd -unfilled -offset indent
@@ -560,31 +582,33 @@ option) then raid0 can be configured normally with:
 .Pp
 When the RAID set is configured for the first time, it is
 necessary to initialize the component labels, and to initialize the
-parity on the RAID set.  Initializing the component labels is done with:
+parity on the RAID set.
+Initializing the component labels is done with:
 .Bd -unfilled -offset indent
 # raidctl -I 112341 raid0
 .Ed
 .Pp
 where
 .Sq 112341
-is a user-specified serial number for the RAID set.  This
-initialization step is
-.Ar required
-for all RAID sets.  Also, using different
-serial numbers between RAID sets is
-.Ar strongly encouraged ,
+is a user-specified serial number for the RAID set.
+This initialization step is
+.Em required
+for all RAID sets.
+Also, using different serial numbers between RAID sets is
+.Em strongly encouraged ,
 as using the same serial number for all RAID sets will only serve to
 decrease the usefulness of the component label checking.
 .Pp
 Initializing the RAID set is done via the
 .Fl i
-option.  This initialization
-.Ar MUST
+option.
+This initialization
+.Em MUST
 be done for
-.Ar all
+.Em all
 RAID sets, since among other things it verifies that the parity (if
-any) on the RAID set is correct.  Since this initialization may be
-quite time-consuming, the
+any) on the RAID set is correct.
+Since this initialization may be quite time-consuming, the
 .Fl v
 option may be also used in conjunction with
 .Fl i :
@@ -608,11 +632,11 @@ to completion of the operation.
 Since it is the parity that provides the
 .Sq redundancy
 part of RAID, it is critical that the parity is correct
-as much as possible.  If the parity is not correct, then there is no
-guarantee that data will not be lost if a component fails.
+as much as possible.
+If the parity is not correct, then there is no guarantee that data will not
+be lost if a component fails.
 .Pp
-Once the parity is known to be correct,
-it is then safe to perform
+Once the parity is known to be correct, it is then safe to perform
 .Xr disklabel 8 ,
 .Xr newfs 8 ,
 or
@@ -623,11 +647,12 @@ for use.
 Under certain circumstances (e.g. the additional component has not
 arrived, or data is being migrated off of a disk destined to become a
 component) it may be desirable to configure a RAID 1 set with only
-a single component.  This can be achieved by configuring the set with
-a physically existing component (as either the first or second
-component) and with a
+a single component.
+This can be achieved by configuring the set with a physically existing
+component (as either the first or second component) and with a
 .Sq fake
-component.  In the following:
+component.
+In the following:
 .Bd -unfilled -offset indent
 START array
 # numRow numCol numSpare
@@ -647,7 +672,8 @@ fifo 100
 .Pp
 .Pa /dev/sd0e
 is the real component, and will be the second disk of a RAID 1
-set.  The component
+set.
+The component
 .Pa /dev/sd6e ,
 which must exist, but have no physical
 device associated with it, is simply used as a placeholder.
@@ -656,31 +682,31 @@ Configuration (using
 and
 .Fl I Ar 12345
 as above) proceeds normally, but initialization of the RAID set will
-have to wait until all physical components are present.  After
-configuration, this set can be used normally, but will be operating
-in degraded mode.  Once a second physical component is obtained, it
-can be hot-added, the existing data mirrored, and normal operation
-resumed.
-.Pp
+have to wait until all physical components are present.
+After configuration, this set can be used normally, but will be operating
+in degraded mode.
+Once a second physical component is obtained, it can be hot-added,
+the existing data mirrored, and normal operation resumed.
 .Ss Maintenance of the RAID set
 After the parity has been initialized for the first time, the command:
 .Bd -unfilled -offset indent
 # raidctl -p raid0
 .Ed
 .Pp
-can be used to check the current status of the parity.  To check the
-parity and rebuild it necessary (for example, after an unclean
+can be used to check the current status of the parity.
+To check the parity and rebuild it necessary (for example, after an unclean
 shutdown) the command:
 .Bd -unfilled -offset indent
 # raidctl -P raid0
 .Ed
 .Pp
-is used.  Note that re-writing the parity can be done while
-other operations on the RAID set are taking place (e.g. while doing a
+is used.
+Note that re-writing the parity can be done while other operations on the
+RAID set are taking place (e.g. while doing an
 .Xr fsck 8
-on a file system on the RAID set).  However: for maximum effectiveness
-of the RAID set, the parity should be known to be correct before any
-data on the set is modified.
+on a file system on the RAID set).
+However: for maximum effectiveness of the RAID set, the parity should be
+known to be correct before any data on the set is modified.
 .Pp
 To see how the RAID set is doing, the following command can be used to
 show the RAID set's status:
@@ -702,14 +728,14 @@ Parity Re-write is 100% complete.
 Copyback is 100% complete.
 .Ed
 .Pp
-This indicates that all is well with the RAID set.  Of importance here
-are the component lines which read
+This indicates that all is well with the RAID set.
+Of importance here are the component lines which read
 .Sq optimal ,
 and the
 .Sq Parity status
-line which indicates that the parity is up-to-date.  Note that if
-there are file systems open on the RAID set, the individual components
-will not be
+line which indicates that the parity is up-to-date.
+Note that if there are file systems open on the RAID set,
+the individual components will not be
 .Sq clean
 but the set as a whole can still be clean.
 .Pp
@@ -777,7 +803,6 @@ Component label for /dev/sd1e:
    Autoconfig: No
    Last configured as: raid0
 .Ed
-.Pp
 .Ss Dealing with Component Failures
 If for some reason
 (perhaps to test reconstruction) it is necessary to pretend a drive
@@ -800,8 +825,8 @@ Spares:
 .Pp
 Note that with the use of
 .Fl f
-a reconstruction has not been started.  To both fail the disk and
-start a reconstruction, the
+a reconstruction has not been started.
+To both fail the disk and start a reconstruction, the
 .Fl F
 option must be used:
 .Bd -unfilled -offset indent
@@ -828,12 +853,13 @@ Parity Re-write is 100% complete.
 Copyback is 100% complete.
 .Ed
 .Pp
-This indicates that a reconstruction is in progress.  To find out how
-the reconstruction is progressing the
+This indicates that a reconstruction is in progress.
+To find out how the reconstruction is progressing the
 .Fl S
-option may be used.  This will indicate the progress in terms of the
-percentage of the reconstruction that is completed.  When the
-reconstruction is finished the
+option may be used.
+This will indicate the progress in terms of the percentage of the
+reconstruction that is completed.
+When the reconstruction is finished the
 .Fl s
 option will show:
 .Bd -unfilled -offset indent
@@ -850,7 +876,8 @@ Parity Re-write is 100% complete.
 Copyback is 100% complete.
 .Ed
 .Pp
-At this point there are at least two options.  First, if
+At this point there are at least two options.
+First, if
 .Pa /dev/sd2e
 is known to be good (i.e. the failure was either caused by
 .Fl f
@@ -859,7 +886,8 @@ or
 or the failed disk was replaced), then a copyback of the data can
 be initiated with the
 .Fl B
-option.  In this example, this would copy the entire contents of
+option.
+In this example, this would copy the entire contents of
 .Pa /dev/sd4e
 to
 .Pa /dev/sd2e .
@@ -880,8 +908,8 @@ The second option after the reconstruction is to simply use
 .Pa /dev/sd4e
 in place of
 .Pa /dev/sd2e
-in the configuration file.  For example, the
-configuration file (in part) might now look like:
+in the configuration file.
+For example, the configuration file (in part) might now look like:
 .Bd -unfilled -offset indent
 START array
 1 3 0
@@ -896,12 +924,13 @@ This can be done as
 .Pa /dev/sd4e
 is completely interchangeable with
 .Pa /dev/sd2e
-at this point.  Note that extreme care must be taken when
-changing the order of the drives in a configuration.  This is one of
-the few instances where the devices and/or their orderings can be
-changed without loss of data!  In general, the ordering of components
-in a configuration file should
-.Ar never
+at this point.
+Note that extreme care must be taken when changing the order of the drives
+in a configuration.
+This is one of the few instances where the devices and/or their orderings
+can be changed without loss of data!
+In general, the ordering of components in a configuration file should
+.Em never
 be changed.
 .Pp
 If a component fails and there are no hot spares
@@ -914,8 +943,8 @@ Components:
 No spares.
 .Ed
 .Pp
-In this case there are a number of options.  The first option is to add a hot
-spare using:
+In this case there are a number of options.
+The first option is to add a hot spare using:
 .Bd -unfilled -offset indent
 # raidctl -a /dev/sd4e raid0
 .Ed
@@ -945,7 +974,8 @@ has been replaced, one can simply use:
 .Pp
 to rebuild the
 .Pa /dev/sd2e
-component.  As the rebuilding is in progress, the status will be:
+component.
+As the rebuilding is in progress, the status will be:
 .Bd -unfilled -offset indent
 Components:
            /dev/sd1e: optimal
@@ -965,7 +995,8 @@ No spares.
 .Pp
 In circumstances where a particular component is completely
 unavailable after a reboot, a special component name will be used to
-indicate the missing component.  For example:
+indicate the missing component.
+For example:
 .Bd -unfilled -offset indent
 Components:
            /dev/sd2e: optimal
@@ -974,10 +1005,11 @@ No spares.
 .Ed
 .Pp
 indicates that the second component of this RAID set was not detected
-at all by the auto-configuration code.  The name
+at all by the auto-configuration code.
+The name
 .Sq component1
-can be used anywhere a normal component name would be used.  For
-example, to add a hot spare to the above set, and rebuild to that hot
+can be used anywhere a normal component name would be used.
+For example, to add a hot spare to the above set, and rebuild to that hot
 spare, the following could be done:
 .Bd -unfilled -offset indent
 # raidctl -a /dev/sd3e raid0
@@ -988,11 +1020,11 @@ at which point the data missing from
 .Sq component1
 would be reconstructed onto
 .Pa /dev/sd3e .
-.Pp
 .Ss RAID on RAID
 RAID sets can be layered to create more complex and much larger RAID
-sets.  A RAID 0 set, for example, could be constructed from four RAID
-5 sets.  The following configuration file shows such a setup:
+sets.
+A RAID 0 set, for example, could be constructed from four RAID 5 sets.
+The following configuration file shows such a setup:
 .Bd -unfilled -offset indent
 START array
 # numRow numCol numSpare
@@ -1013,30 +1045,28 @@ fifo 100
 .Ed
 .Pp
 A similar configuration file might be used for a RAID 0 set
-constructed from components on RAID 1 sets.  In such a configuration,
-the mirroring provides a high degree of redundancy, while the striping
-provides additional speed benefits.
-.Pp
+constructed from components on RAID 1 sets.
+In such a configuration, the mirroring provides a high degree of redundancy,
+while the striping provides additional speed benefits.
 .Ss Auto-configuration and Root on RAID
-RAID sets can also be auto-configured at boot.  To make a set
-auto-configurable, simply prepare the RAID set as above, and then do
-a:
-.Bd -unfilled -offset indent
-# raidctl -A yes raid0
-.Ed
+RAID sets can also be auto-configured at boot.
+To make a set auto-configurable, simply prepare the RAID set as above,
+and then do a:
 .Pp
-to turn on auto-configuration for that set.  To turn off
-auto-configuration, use:
-.Bd -unfilled -offset indent
-# raidctl -A no raid0
-.Ed
+.Dl # raidctl -A yes raid0
+.Pp
+to turn on auto-configuration for that set.
+To turn off auto-configuration, use:
+.Pp
+.Dl # raidctl -A no raid0
 .Pp
 RAID sets which are auto-configurable will be configured before the
-root file system is mounted.  These RAID sets are thus available for
-use as a root file system, or for any other file system.  A primary
-advantage of using the auto-configuration is that RAID components
-become more independent of the disks they reside on.  For example,
-SCSI ID's can change, but auto-configured sets will always be
+root file system is mounted.
+These RAID sets are thus available for use as a root file system,
+or for any other file system.
+A primary advantage of using the auto-configuration is that RAID components
+become more independent of the disks they reside on.
+For example, SCSI ID's can change, but auto-configured sets will always be
 configured correctly, even if the SCSI ID's of the component disks
 have become scrambled.
 .Pp
@@ -1057,23 +1087,25 @@ To return raid0 to be just an auto-configuring set simply use the
 arguments.
 .Pp
 .\" Note that kernels can only be directly read from RAID 1 components on
-.\" alpha and pmax architectures.  On those architectures, the
+.\" alpha and pmax architectures.
+.\" On those architectures, the
 .\" .Dv FS_RAID
 .\" file system is recognized by the bootblocks, and will properly load the
 .\" kernel directly from a RAID 1 component.
 .\" For other architectures, or
 Note that kernels can't be directly read from a RAID component.
 To support the root file system on RAID sets, some mechanism must be
-used to get a kernel booting.  For example, a small partition containing
-only the secondary boot-blocks and an alternate kernel (or two) could be
-used.  Once a kernel is booting however, and an auto-configured RAID
+used to get a kernel booting.
+For example, a small partition containing only the secondary boot-blocks
+and an alternate kernel (or two) could be used.
+Once a kernel is booting however, and an auto-configured RAID
 set is found that is eligible to be root, then that RAID set will be
 auto-configured and its
 .Sq a
-partition (aka raid[0..n]a) will be used as the root file system.  If two or
-more RAID sets claim to be root devices, then the user will be prompted to
-select the root device.  At this time, RAID 0, 1, 4, and 5 sets are all
-supported as root devices.
+partition (aka raid[0..n]a) will be used as the root file system.
+If two or more RAID sets claim to be root devices, then the user will be
+prompted to select the root device.
+At this time, RAID 0, 1, 4, and 5 sets are all supported as root devices.
 .Pp
 A typical RAID 1 setup with root on RAID might be as follows:
 .Bl -enum
@@ -1100,28 +1132,33 @@ wd0h and wd0h - a RAID 1 set, raid3, if desired.
 .El
 .Pp
 RAID sets raid0, raid1, and raid2 are all marked as
-auto-configurable.  raid0 is marked as being a root-able raid.
+auto-configurable.
+raid0 is marked as being a root-able raid.
 When new kernels are installed, the kernel is not only copied to
 .Pa / ,
-but also to wd0a and wd1a.  The kernel on wd0a is required, since that
-is the kernel the system boots from.  The kernel on wd1a is also
-required, since that will be the kernel used should wd0 fail.  The
-important point here is to have redundant copies of the kernel
+but also to wd0a and wd1a.
+The kernel on wd0a is required, since that is the kernel the system
+boots from.
+The kernel on wd1a is also required, since that will be the kernel used
+should wd0 fail.
+The important point here is to have redundant copies of the kernel
 available, in the event that one of the drives fail.
 .Pp
 There is no requirement that the root file system be on the same disk
-as the kernel.  For example, obtaining the kernel from wd0a, and using
-sd0e and sd1e for raid0, and the root file system, is fine.  It
-.Ar is
+as the kernel.
+For example, obtaining the kernel from wd0a, and using
+sd0e and sd1e for raid0, and the root file system, is fine.
+It
+.Em is
 critical, however, that there be multiple kernels available, in the
 event of media failure.
 .Pp
 Multi-layered RAID devices (such as a RAID 0 set made
 up of RAID 1 sets) are
-.Ar not
+.Em not
 supported as root devices or auto-configurable devices at this point.
 (Multi-layered RAID devices
-.Ar are
+.Em are
 supported in general, however, as mentioned earlier.)  Note that in
 order to enable component auto-detection and auto-configuration of
 RAID devices, the line:
@@ -1129,22 +1166,21 @@ RAID devices, the line:
 option	RAID_AUTOCONFIG
 .Ed
 .Pp
-must be in the kernel configuration file.  See
+must be in the kernel configuration file.
+See
 .Xr raid 4
 for more details.
-.Pp
 .Ss Unconfiguration
 The final operation performed by
 .Nm
 is to unconfigure a
 .Xr raid 4
-device.  This is accomplished via a simple:
-.Bd -unfilled -offset indent
-# raidctl -u raid0
-.Ed
+device.
+This is accomplished via a simple:
 .Pp
-at which point the device is ready to be reconfigured.
+.Dl # raidctl -u raid0
 .Pp
+at which point the device is ready to be reconfigured.
 .Ss Performance Tuning
 Selection of the various parameter values which result in the best
 performance can be quite tricky, and often requires a bit of
@@ -1166,70 +1202,74 @@ CPU speed
 .El
 .Pp
 As with most performance tuning, benchmarking under real-life loads
-may be the only way to measure expected performance.  Understanding
-some of the underlying technology is also useful in tuning.  The goal
-of this section is to provide pointers to those parameters which may
+may be the only way to measure expected performance.
+Understanding some of the underlying technology is also useful in tuning.
+The goal of this section is to provide pointers to those parameters which may
 make significant differences in performance.
 .Pp
-For a RAID 1 set, a SectPerSU value of 64 or 128 is typically
-sufficient.  Since data in a RAID 1 set is arranged in a linear
+For a RAID 1 set, a SectPerSU value of 64 or 128 is typically sufficient.
+Since data in a RAID 1 set is arranged in a linear
 fashion on each component, selecting an appropriate stripe size is
-somewhat less critical than it is for a RAID 5 set.  However: a stripe
-size that is too small will cause large IO's to be broken up into a
-number of smaller ones, hurting performance.  At the same time, a
-large stripe size may cause problems with concurrent accesses to
-stripes, which may also affect performance.  Thus values in the range
-of 32 to 128 are often the most effective.
-.Pp
-Tuning RAID 5 sets is trickier.  In the best case, IO is presented to
-the RAID set one stripe at a time.  Since the entire stripe is
-available at the beginning of the IO, the parity of that stripe can
-be calculated before the stripe is written, and then the stripe data
-and parity can be written in parallel.  When the amount of data being
-written is less than a full stripe worth, the
+somewhat less critical than it is for a RAID 5 set.
+However: a stripe size that is too small will cause large IO's to be
+broken up into a number of smaller ones, hurting performance.
+At the same time, a large stripe size may cause problems with concurrent
+accesses to stripes, which may also affect performance.
+Thus values in the range of 32 to 128 are often the most effective.
+.Pp
+Tuning RAID 5 sets is trickier.
+In the best case, IO is presented to the RAID set one stripe at a time.
+Since the entire stripe is available at the beginning of the IO,
+the parity of that stripe can be calculated before the stripe is written,
+and then the stripe data and parity can be written in parallel.
+When the amount of data being written is less than a full stripe worth, the
 .Sq small write
-problem occurs.  Since a
+problem occurs.
+Since a
 .Sq small write
 means only a portion of the stripe on the components is going to
 change, the data (and parity) on the components must be updated
-slightly differently.  First, the
+slightly differently.
+First, the
 .Sq old parity
 and
 .Sq old data
-must be read from the components.  Then the new parity is constructed,
-using the new data to be written, and the old data and old parity.
-Finally, the new data and new parity are written.  All this extra data
-shuffling results in a serious loss of performance, and is typically 2
-to 4 times slower than a full stripe write (or read).  To combat this
-problem in the real world, it may be useful to ensure that stripe
-sizes are small enough that a
+must be read from the components.
+Then the new parity is constructed, using the new data to be written,
+and the old data and old parity.
+Finally, the new data and new parity are written.
+All this extra data shuffling results in a serious loss of performance,
+and is typically 2 to 4 times slower than a full stripe write (or read).
+To combat this problem in the real world, it may be useful to ensure that
+stripe sizes are small enough that a
 .Sq large IO
-from the system will use exactly one large stripe write. As is seen
-later, there are some file system dependencies which may come into play
-here as well.
+from the system will use exactly one large stripe write.
+As is seen later, there are some file system dependencies which may come
+into play here as well.
 .Pp
 Since the size of a
 .Sq large IO
 is often (currently) only 32K or 64K, on a 5-drive RAID 5 set it may
 be desirable to select a SectPerSU value of 16 blocks (8K) or 32
-blocks (16K).  Since there are 4 data sectors per stripe, the maximum
-data per stripe is 64 blocks (32K) or 128 blocks (64K).  Again,
-empirical measurement will provide the best indicators of which
+blocks (16K).
+Since there are 4 data sectors per stripe, the maximum
+data per stripe is 64 blocks (32K) or 128 blocks (64K).
+Again, empirical measurement will provide the best indicators of which
 values will yield better performance.
 .Pp
 The parameters used for the file system are also critical to good
-performance.  For
+performance.
+For
 .Xr newfs 8 ,
 for example, increasing the block size to 32K or 64K may improve
-performance dramatically.  Also, changing the cylinders-per-group
-parameter from 16 to 32 or higher is often not only necessary for
-larger file systems, but may also have positive performance
-implications.
-.Pp
+performance dramatically.
+Also, changing the cylinders-per-group parameter from 16 to 32 or higher
+is often not only necessary for larger file systems, but may also have
+positive performance implications.
 .Ss Summary
 Despite the length of this man-page, configuring a RAID set is a
-relatively straight-forward process.  All that needs to be done is the
-following steps:
+relatively straight-forward process.
+All that needs to be done is the following steps:
 .Bl -enum
 .It
 Use
@@ -1299,39 +1339,36 @@ where it will automatically be started by the
 .Pa /etc/rc
 scripts.
 .El
-.Pp
 .Sh WARNINGS
 Certain RAID levels (1, 4, 5, 6, and others) can protect against some
-data loss due to component failure.  However the loss of two
-components of a RAID 4 or 5 system, or the loss of a single component
-of a RAID 0 system will result in the entire filesystem being lost.
+data loss due to component failure.
+However the loss of two components of a RAID 4 or 5 system, or the loss
+of a single component of a RAID 0 system will result in the entire
+filesystem being lost.
 RAID is
-.Ar NOT
+.Em NOT
 a substitute for good backup practices.
 .Pp
 Recomputation of parity
-.Ar MUST
+.Em MUST
 be performed whenever there is a chance that it may have been
-compromised.  This includes after system crashes, or before a RAID
-device has been used for the first time.  Failure to keep parity
-correct will be catastrophic should a component ever fail -- it is
-better to use RAID 0 and get the additional space and speed, than it
-is to use parity, but not keep the parity correct.  At least with RAID
-0 there is no perception of increased data security.
-.Pp
+compromised.
+This includes after system crashes, or before a RAID
+device has been used for the first time.
+Failure to keep parity correct will be catastrophic should a component
+ever fail -- it is better to use RAID 0 and get the additional space
+and speed, than it is to use parity, but not keep the parity correct.
+At least with RAID 0 there is no perception of increased data security.
 .Sh FILES
 .Bl -tag -width /dev/XXrXraidX -compact
 .It Pa /dev/{,r}raid*
 .Cm raid
 device special files.
 .El
-.Pp
 .Sh SEE ALSO
 .Xr ccd 4 ,
 .Xr raid 4 ,
 .Xr rc 8
-.Sh BUGS
-Hot-spare removal is currently not available.
 .Sh HISTORY
 RAIDframe is a framework for rapid prototyping of RAID structures
 developed by the folks at the Parallel Data Laboratory at Carnegie
@@ -1351,6 +1388,8 @@ is a complete re-write, and first appeared in
 .Nx 1.4
 from where it was ported to
 .Ox 2.5 .
+.Sh BUGS
+Hot-spare removal is currently not available.
 .Sh COPYRIGHT
 .Bd -unfilled
 The RAIDframe Copyright is as follows:
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 90c1c3c8e7e..ba5faacdea6 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: restore.8,v 1.24 2003/06/02 20:06:16 millert Exp $
+.\"	$OpenBSD: restore.8,v 1.25 2003/06/03 13:16:09 jmc Exp $
 .\"	$NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -322,6 +322,38 @@ preceded by its file type.
 Do not ask the user whether to abort the restore in the event of an error.
 Always try to skip over the bad block(s) and continue.
 .El
+.Sh ENVIRONMENT
+If the following environment variable exists it will be utilized by
+.Nm restore :
+.Pp
+.Bl -tag -width "TMPDIR"
+.It Ev TMPDIR
+The directory given in
+.Ev TMPDIR
+will be used
+instead of
+.Pa /tmp
+to store temporary files.
+Refer to
+.Xr environ 7
+for more information.
+.It Ev TAPE
+Default tape device to use instead of
+.Pa /dev/rst0 .
+.El
+.Sh FILES
+.Bl -tag -width "./restoresymtable" -compact
+.It Pa /dev/rst0
+the default tape drive
+.It Pa /dev/rst*
+raw SCSI tape interface
+.It Pa /tmp/rstdir*
+file containing directories on the tape
+.It Pa /tmp/rstmode*
+owner, mode, and time stamps for directories
+.It Pa \&./restoresymtable
+information passed between incremental restores
+.El
 .Sh DIAGNOSTICS
 Complains if it gets a read error.
 If
@@ -392,44 +424,17 @@ After a dump read error,
 may have to resynchronize itself.
 This message lists the number of blocks that were skipped over.
 .El
-.Sh ENVIRONMENT
-If the following environment variable exists it will be utilized by
-.Nm restore :
-.Pp
-.Bl -tag -width "TMPDIR"
-.It Ev TMPDIR
-The directory given in
-.Ev TMPDIR
-will be used
-instead of
-.Pa /tmp
-to store temporary files.
-Refer to
-.Xr environ 7
-for more information.
-.It Ev TAPE
-Default tape device to use instead of
-.Pa /dev/rst0 .
-.El
-.Sh FILES
-.Bl -tag -width "./restoresymtable" -compact
-.It Pa /dev/rst0
-the default tape drive
-.It Pa /dev/rst*
-raw SCSI tape interface
-.It Pa /tmp/rstdir*
-file containing directories on the tape
-.It Pa /tmp/rstmode*
-owner, mode, and time stamps for directories
-.It Pa \&./restoresymtable
-information passed between incremental restores
-.El
 .Sh SEE ALSO
 .Xr environ 7 ,
 .Xr dump 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr rmt 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
 .Sh BUGS
 .Nm
 can get confused when doing incremental restores from
@@ -465,8 +470,3 @@ be the same across different processes.
 In all other cases, the files are unique because it is possible to
 have two different dumps started at the same time, and separate
 operations shouldn't conflict with each other.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.2 .
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 3bcfedb5e65..5415d9dddde 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: routed.8,v 1.35 2003/06/02 20:06:17 millert Exp $
+.\"	$OpenBSD: routed.8,v 1.36 2003/06/03 13:16:09 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -307,7 +307,7 @@ with the
 or
 .Dv SIGUSR2
 signals or with the
-.Xr rtquery
+.Xr rtquery 8
 command.
 .It Fl F Ar net[/mask][,metric]
 Minimize routes in transmissions via interfaces with addresses that match
@@ -321,7 +321,6 @@ If
 .Em metric
 is absent, a value of 14 is assumed to limit
 the spread of the "fake" default route.
-
 This is a dangerous feature that when used carelessly can cause routing
 loops.
 Notice also that more than one interface can match the specified network
@@ -449,7 +448,7 @@ or
 or
 .Xr named 8
 must have been started before
-.Nm routed Ns .)
+.Nm routed . )
 .Pp
 .Ar mask
 is an optional number between 1 and 32 indicating the netmask associated
@@ -521,7 +520,6 @@ transmitted, and any received RIP packets will be ignored).
 If no interfaces are allowed to process RIP packets,
 .Nm
 acts purely as a router discovery daemon.
-
 Note that turning off RIP without explicitly turning on router
 discovery advertisements with
 .Cm rdisc_adv
@@ -594,11 +592,11 @@ for distant gateways
 .%R XSIS 028112
 .%Q Xerox System Integration Standard
 .Re
-.Sh BUGS
-It does not always detect unidirectional failures in network interfaces
-(e.g., when the output side fails).
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.2 .
+.Sh BUGS
+It does not always detect unidirectional failures in network interfaces
+(e.g., when the output side fails).
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 7bf51b70046..85c68052817 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtquery.8,v 1.15 2003/06/02 20:06:17 millert Exp $
+.\"	$OpenBSD: rtquery.8,v 1.16 2003/06/03 13:16:09 jmc Exp $
 .\"
 .\" Copyright (c) 1982, 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -26,7 +26,7 @@
 .\" 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 June 1, 1996
 .Dt RTQUERY 8
 .Os
@@ -44,7 +44,7 @@
 is used to query a network routing daemon,
 .Xr routed 8
 or
-.Xr gated 8 ,
+.Xr gated ,
 for its routing table by sending a
 .Cm request
 or
@@ -66,7 +66,7 @@ uses the
 .Cm poll
 command, an
 undocumented extension to the RIP protocol supported by
-.Xr gated 8 .
+.Xr gated .
 When querying gated, the
 .Cm poll
 command is preferred over the
@@ -95,9 +95,9 @@ option displays only the numeric network and host numbers.
 Uses the
 .Cm poll
 command to request full routing information from
-.Xr gated 8 .
+.Xr gated .
 This is an undocumented extension RIP protocol supported only by
-.Xr gated 8 .
+.Xr gated .
 .It Fl 1
 Query using RIP version 1 instead of RIP version 2.
 .It Fl w Ar timeout
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 7cc216c9cc6..cfcc623ec7d 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: savecore.8,v 1.13 2003/06/02 20:06:17 millert Exp $
+.\"	$OpenBSD: savecore.8,v 1.14 2003/06/03 13:16:09 jmc Exp $
 .\"	$NetBSD: savecore.8,v 1.11 1995/06/27 22:40:46 briggs Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -120,8 +120,6 @@ is meant to be called near the end of the initialization file
 .It Pa /bsd
 current kernel
 .El
-.Sh BUGS
-The minfree code does not consider the effect of compression.
 .Sh SEE ALSO
 .Xr compress 1 ,
 .Xr syslogd 8
@@ -130,3 +128,5 @@ The
 .Nm
 command appeared in
 .Bx 4.1 .
+.Sh BUGS
+The minfree code does not consider the effect of compression.
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 75ec8f89439..9d8c6cc0d3a 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.8,v 1.22 2003/04/30 11:58:49 jmc Exp $
+.\"	$OpenBSD: scsi.8,v 1.23 2003/06/03 13:16:09 jmc Exp $
 .\"	$FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .\" Written By Julian ELischer
@@ -242,6 +242,28 @@ to indicate that
 .Ar count
 bytes of data input should be written to the standard output.
 .El
+.Sh ENVIRONMENT
+The
+.Ev SU_DEBUG_OUTPUT
+variable can be set to a file to send debugging
+output to that file.
+.Pp
+The
+.Ev SU_DEBUG_LEVEL
+variable can be set to a non-zero integer to increase
+the level of debugging.
+Currently this is an on or off thing; it should
+perhaps use the ioctl to set the debug level in the kernel and then set
+it back to zero at program exit.
+.Pp
+The
+.Ev SU_DEBUG_TRUNCATE
+variable can be set to an integer to limit the
+amount of data phase output sent to the debugging file.
+.Pp
+The
+.Ev EDITOR
+variable determines the editor to use for the mode editor.
 .Sh EXAMPLES
 To verify that the device type for the disk
 .Pa /dev/rsd0c
@@ -266,31 +288,14 @@ drive (set AWRE and ARRE to 1 to enable bad block remapping):
 .Bd -literal -offset
 # scsi -f /dev/rsd2c -m 1 -e -P 3
 .Ed
-.Sh ENVIRONMENT
-The
-.Ev SU_DEBUG_OUTPUT
-variable can be set to a file to send debugging
-output to that file.
-.Pp
-The
-.Ev SU_DEBUG_LEVEL
-variable can be set to a non-zero integer to increase
-the level of debugging.
-Currently this is an on or off thing; it should
-perhaps use the ioctl to set the debug level in the kernel and then set
-it back to zero at program exit.
-.Pp
-The
-.Ev SU_DEBUG_TRUNCATE
-variable can be set to an integer to limit the
-amount of data phase output sent to the debugging file.
-.Pp
-The
-.Ev EDITOR
-variable determines the editor to use for the mode editor.
 .Sh SEE ALSO
 .Xr scsi 3 ,
 .Xr scsi 4
+.Sh HISTORY
+The
+.Nm
+command appeared in 386BSD 0.1.2.4/FreeBSD to support the new reprobe
+and user SCSI commands.
 .Sh BUGS
 Some devices respond to an inquiry for all LUNS.
 This will cause them
@@ -298,8 +303,3 @@ to come on line to 8 times during reprobe to different logical units.
 "scsi -f /dev/rsd0c -c "4 0 0 0 0 0" permits anyone who can write to
 .Pa /dev/rsd0c
 to format the disk drive.
-.Sh HISTORY
-The
-.Nm
-command appeared in 386BSD 0.1.2.4/FreeBSD to support the new reprobe
-and user SCSI commands.
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 74bef0846b7..3c734be7ca4 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shutdown.8,v 1.32 2003/06/02 20:06:17 millert Exp $
+.\"	$OpenBSD: shutdown.8,v 1.33 2003/06/03 13:16:09 jmc Exp $
 .\"	$NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -194,7 +194,7 @@ before the system is shutdown
 .Xr halt 8 ,
 .Xr rc.shutdown 8 ,
 .Xr reboot 8
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The hours and minutes in the second time format may be separated by
 a colon
 .Pq Sq \&:
diff --git a/sbin/swapctl/swapctl.8 b/sbin/swapctl/swapctl.8
index 772e7fdf600..97ea7a2ac4d 100644
--- a/sbin/swapctl/swapctl.8
+++ b/sbin/swapctl/swapctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: swapctl.8,v 1.21 2003/05/10 06:33:39 jmc Exp $
+.\"	$OpenBSD: swapctl.8,v 1.22 2003/06/03 13:16:09 jmc Exp $
 .\"	$NetBSD: swapctl.8,v 1.14 1998/05/22 18:27:52 msaitoh Exp $
 .\"
 .\" Copyright (c) 1997 Matthew R. Green
@@ -240,4 +240,5 @@ program, provided for backwards compatibility, appeared in
 .Sh AUTHORS
 The
 .Nm
-program was written by Matthew R. Green <mrg@eterna.com.au>.
+program was written by
+.An Matthew R. Green Aq mrg@eterna.com.au .
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 0f04e4c3514..c52c0b428eb 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.101 2003/06/02 20:06:17 millert Exp $
+.\"	$OpenBSD: sysctl.8,v 1.102 2003/06/03 13:16:09 jmc Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -374,6 +374,46 @@ By default, only filesystems that are actively being used are listed.
 Use of the
 .Fl A
 flag lists all the filesystems compiled into the running kernel.
+.Sh FILES
+.Bl -tag -width <ufs/ffs/ffs_extern.h> -compact
+.It Aq Pa sys/sysctl.h
+definitions for top level identifiers, second level kernel and hardware
+identifiers, and user level identifiers
+.It Aq Pa dev/rndvar.h
+definitions for
+.Xr random 4
+device's statistics structure
+.It Aq Pa sys/socket.h
+definitions for second level network identifiers
+.It Aq Pa sys/gmon.h
+definitions for third level profiling identifiers
+.It Aq Pa uvm/uvm_param.h
+definitions for second level virtual memory identifiers
+.It Aq Pa uvm/uvm_swap_encrypt.h
+definitions for third level virtual memory identifiers
+.It Aq Pa netinet/in.h
+definitions for third level IPv4/v6 identifiers and
+fourth level IPv4/v6 identifiers
+.It Aq Pa netinet/icmp_var.h
+definitions for fourth level ICMP identifiers
+.It Aq Pa netinet6/icmp6.h
+definitions for fourth level ICMPv6 identifiers
+.It Aq Pa netinet/tcp_var.h
+definitions for fourth level TCP identifiers
+.It Aq Pa netinet/udp_var.h
+definitions for fourth level UDP identifiers
+.It Aq Pa netipx/ipx_var.h
+definitions for third level IPX identifiers and
+fourth level IPX identifiers
+.It Aq Pa ddb/db_var.h
+definitions for second level ddb identifiers
+.It Aq Pa sys/mount.h
+definitions for second level vfs identifiers
+.It Aq Pa nfs/nfs.h
+definitions for third level NFS identifiers
+.It Aq Pa ufs/ffs/ffs_extern.h
+definitions for third level FFS identifiers
+.El
 .Sh EXAMPLES
 To retrieve the maximum number of processes allowed
 in the system:
@@ -441,46 +481,6 @@ the maximum number of shared memory segments:
 # sysctl -w kern.shminfo.shmmax=33554432
 # sysctl -w kern.shminfo.shmseg=32
 .Ed
-.Sh FILES
-.Bl -tag -width <ufs/ffs/ffs_extern.h> -compact
-.It Pa <sys/sysctl.h>
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
-.It Pa <dev/rndvar.h>
-definitions for
-.Xr random 4
-device's statistics structure
-.It Pa <sys/socket.h>
-definitions for second level network identifiers
-.It Pa <sys/gmon.h>
-definitions for third level profiling identifiers
-.It Pa <uvm/uvm_param.h>
-definitions for second level virtual memory identifiers
-.It Pa <uvm/uvm_swap_encrypt.h>
-definitions for third level virtual memory identifiers
-.It Pa <netinet/in.h>
-definitions for third level IPv4/v6 identifiers and
-fourth level IPv4/v6 identifiers
-.It Pa <netinet/icmp_var.h>
-definitions for fourth level ICMP identifiers
-.It Pa <netinet6/icmp6.h>
-definitions for fourth level ICMPv6 identifiers
-.It Pa <netinet/tcp_var.h>
-definitions for fourth level TCP identifiers
-.It Pa <netinet/udp_var.h>
-definitions for fourth level UDP identifiers
-.It Pa <netipx/ipx_var.h>
-definitions for third level IPX identifiers and
-fourth level IPX identifiers
-.It Pa <ddb/db_var.h>
-definitions for second level ddb identifiers
-.It Pa <sys/mount.h>
-definitions for second level vfs identifiers
-.It Pa <nfs/nfs.h>
-definitions for third level NFS identifiers
-.It Pa <ufs/ffs/ffs_extern.h>
-definitions for third level FFS identifiers
-.El
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr sysctl.conf 5
diff --git a/sbin/wicontrol/wicontrol.8 b/sbin/wicontrol/wicontrol.8
index 8d3077049ee..ec2ded404d9 100644
--- a/sbin/wicontrol/wicontrol.8
+++ b/sbin/wicontrol/wicontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wicontrol.8,v 1.46 2003/02/17 07:24:33 jmc Exp $
+.\"	$OpenBSD: wicontrol.8,v 1.47 2003/06/03 13:16:09 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu> All rights reserved.
@@ -313,7 +313,7 @@ be able to associate with the access point but will be unable to send and
 receive data packets unless they have the correct WEP key.
 .br
 With
-.Em Shared Key Authentication,
+.Em Shared Key Authentication ,
 on the other hand, only stations that have the same WEP key as the access
 point may associate with it.
 .br
@@ -382,7 +382,6 @@ is specified in milliseconds.
 The default is 100.
 .El
 .Ss Explanation of port types
-.Pp
 There are five modes the NIC can operate in:
 .Bl -tag -width Ds -offset indent
 .It BSS mode
diff --git a/sbin/wsconsctl/wsconsctl.8 b/sbin/wsconsctl/wsconsctl.8
index bb31bc5b1d3..6d267eeef26 100644
--- a/sbin/wsconsctl/wsconsctl.8
+++ b/sbin/wsconsctl/wsconsctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsconsctl.8,v 1.14 2003/05/20 12:59:01 jmc Exp $
+.\" $OpenBSD: wsconsctl.8,v 1.15 2003/06/03 13:16:09 jmc Exp $
 .\" $NetBSD: wsconsctl.8,v 1.5 1999/09/12 18:47:11 kleink Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -110,6 +110,20 @@ Use the
 .Xr kbd 8
 utility to determine which keyboard encodings are available for your
 country.
+.Sh FILES
+.Bl -tag -width /usr/include/dev/wscons/wsconsio.h -compact
+.It Pa /dev/wskbd0
+keyboard control device
+.It Pa /dev/wsmouse0
+mouse control device
+.It Pa /dev/ttyC0
+display control device
+.It Pa /usr/include/dev/wscons/wsconsio.h
+keyboard/mouse/display definitions
+.It Pa /etc/wsconsctl.conf
+a list of parameters that get set at system startup time from
+.Xr rc 8
+.El
 .Sh EXAMPLES
 .Li # wsconsctl -w keyboard.encoding=uk
 .Pp
@@ -171,20 +185,6 @@ Sets the bell pitch to be 1200.
 .Li # wsconsctl -w keyboard.bell.pitch+=200
 .Pp
 Adds 200 to the current pitch of the bell.
-.Sh FILES
-.Bl -tag -width /usr/include/dev/wscons/wsconsio.h -compact
-.It Pa /dev/wskbd0
-keyboard control device
-.It Pa /dev/wsmouse0
-mouse control device
-.It Pa /dev/ttyC0
-display control device
-.It Pa /usr/include/dev/wscons/wsconsio.h
-keyboard/mouse/display definitions
-.It Pa /etc/wsconsctl.conf
-a list of parameters that get set at system startup time from
-.Xr rc 8
-.El
 .Sh SEE ALSO
 .Xr pckbd 4 ,
 .Xr wscons 4 ,