43 files changed, 345 insertions, 345 deletions

diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 84e84914aad6..fc2a064b57b0 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -171,6 +171,13 @@ Empty file.
 Its presence indicates that the machine's CMOS clock is set to local
 time, while its absence indicates a UTC CMOS clock.
 .El
+.Sh DIAGNOSTICS
+No diagnostics.
+If an error occurs,
+.Nm
+logs an error message via
+.Xr syslog 3
+and exits with a nonzero return code.
 .Sh SEE ALSO
 .Xr tzset 3 ,
 .Xr crontab 5 ,
@@ -179,17 +186,10 @@ time, while its absence indicates a UTC CMOS clock.
 .Xr sysctl 8 ,
 .Xr tzsetup 8 ,
 .Xr zic 8
-.Sh DIAGNOSTICS
-No diagnostics.
-If an error occurs,
-.Nm
-logs an error message via
-.Xr syslog 3
-and exits with a nonzero return code.
-.Sh AUTHORS
-.An Andrey A. Chernov Aq ache@astral.msk.su
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Fx 1.0 .
+.Sh AUTHORS
+.An Andrey A. Chernov Aq ache@astral.msk.su
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index 7ffd0d2e51fc..f98bed957f7b 100644
--- a/sbin/atm/fore_dnld/fore_dnld.8
+++ b/sbin/atm/fore_dnld/fore_dnld.8
@@ -98,8 +98,6 @@ adapters.
 .It Pa ~harp/doc/Install
 HARP installation instructions.
 .El
-.Sh BUGS
-None known.
 .Sh COPYRIGHT
 Copyright (c) 1994-1998, Network Computing Services, Inc.
 .Sh AUTHORS
@@ -113,3 +111,5 @@ Minnesota Supercomputer Center, Inc.
 This software was developed under the sponsorship of the
 Defense Advanced Research Projects Agency (DARPA) under
 contract numbers F19628-92-C-0072 and F19628-95-C-0215.
+.Sh BUGS
+None known.
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index a3b526577e7c..59629c164daa 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -94,9 +94,6 @@ The ATM Forum,
 .%T "ATM User-Network Interface, Version 3.1 (UNI 3.1) Specification"
 for details on the ILMI protocols and address registration
 procedures.
-.Sh BUGS
-Please report any bugs to
-.Aq harp\-bugs@magic.net .
 .Sh COPYRIGHT
 Copyright (c) 1994-1998, Network Computing Services, Inc.
 .Sh AUTHORS
@@ -109,3 +106,6 @@ Network Computing Services, Inc.
 .Sh ACKNOWLEDGMENTS
 This software was developed with the support of the
 Defense Advanced Research Projects Agency (DARPA).
+.Sh BUGS
+Please report any bugs to
+.Aq harp\-bugs@magic.net .
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index be24febcd039..10812b6b567e 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -112,22 +112,22 @@ it will ask
 A positive response will cause
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.
-.Sh SEE ALSO
-.Xr fsck 8
 .Sh DIAGNOSTICS
 The
 .Nm
 utility refuses to attach a block that
 resides in a critical area or is out of range of the file system.
 A warning is issued if the block is already in use.
+.Sh SEE ALSO
+.Xr fsck 8
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Bx 4.1 .
 .Sh BUGS
 If more than one sector which comprise a file system fragment are bad,
 you should specify only one of them to
 .Nm ,
 as the blocks in the bad sector files actually cover all the sectors in a
 file system fragment.
-.Sh HISTORY
-The
-.Nm
-utility appeared in
-.Bx 4.1 .
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 63de9386785c..6b4a331e0d8c 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -129,6 +129,11 @@ The component devices need to name partitions of type
 .Dq 4.2BSD
 as shown by
 .Xr disklabel 8 ) .
+.Sh FILES
+.Bl -tag -width /etc/ccd.conf -compact
+.It Pa /etc/ccd.conf
+default ccd configuration file
+.El
 .Sh EXAMPLES
 A number of
 .Nm
@@ -209,11 +214,6 @@ or software RAID systems such as
 .Xr geom 8
 and
 .Xr vinum 8 .
-.Sh FILES
-.Bl -tag -width /etc/ccd.conf -compact
-.It Pa /etc/ccd.conf
-default ccd configuration file
-.El
 .Sh SEE ALSO
 .Xr dd 1 ,
 .Xr ccd 4 ,
@@ -222,6 +222,11 @@ default ccd configuration file
 .Xr fdisk 8 ,
 .Xr rc 8 ,
 .Xr vinum 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Nx 1.0a .
 .Sh BUGS
 The initial disklabel returned by
 .Xr ccd 4
@@ -231,8 +236,3 @@ One needs to change the number of paritions to 8 using
 to get the usual
 .Bx
 expectations.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Nx 1.0a .
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 6ca6420b1920..87a7630582e3 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -45,9 +45,6 @@ The standard way to use
 is to put invocations of it in the
 .Pa /etc/rc.d/serial
 startup script.
-.Sh SEE ALSO
-.Xr stty 1 ,
-.Xr sio 4
 .Sh FILES
 .Bl -tag -width /dev/ttyd? -compact
 .It Pa /dev/ttyd?
@@ -55,11 +52,14 @@ dialin devices, hardwired terminals
 .It Pa /dev/cuad?
 dialout devices
 .El
-.Sh AUTHORS
-.An Christopher G. Demetriou
+.Sh SEE ALSO
+.Xr stty 1 ,
+.Xr sio 4
 .Sh HISTORY
 Originally part of cgd's com package patches, version 0.2.1, to
 .Bx 386 0.1 .
 Once controlled bidirectional capabilities.
 Little is left to control now
 that these capabilities are standard.
+.Sh AUTHORS
+.An Christopher G. Demetriou
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index b7be5efc8d1e..adf17087cd26 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -464,17 +464,22 @@ dump table: file systems and frequency
 to find group
 .Em operator
 .El
+.Sh EXIT STATUS
+Dump 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 DIAGNOSTICS
+Many, and verbose.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr fstab 5 ,
 .Xr restore 8 ,
 .Xr rmt 8
-.Sh DIAGNOSTICS
-Many, and verbose.
-.Sh EXIT STATUS
-Dump 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 HISTORY
+A
+.Nm
+utility appeared in
+.At v6 .
 .Sh BUGS
 Fewer than 32 read errors on the file system are ignored, though all
 errors will generate a warning message.
@@ -526,8 +531,3 @@ This will be fixed in a later version of
 .Fx .
 Presently, it works if you set it setuid (like it used to be), but this
 might constitute a security risk.
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v6 .
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index ff364e1b542d..096cbde246d0 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -116,6 +116,13 @@ variable of
 .Xr loader 8
 must be used to enable dumps for system panics which occur
 during kernel initialization.
+.Sh FILES
+.Bl -tag -width "/dev/{ad,da}?s?b" -compact
+.It Pa /dev/{ad,da}?s?b
+standard swap areas
+.It Pa /etc/rc.conf
+boot-time system configuration
+.El
 .Sh SEE ALSO
 .Xr fstab 5 ,
 .Xr rc.conf 5 ,
@@ -126,18 +133,11 @@ during kernel initialization.
 .Xr savecore 8 ,
 .Xr swapon 8 ,
 .Xr panic 9
-.Sh FILES
-.Bl -tag -width "/dev/{ad,da}?s?b" -compact
-.It Pa /dev/{ad,da}?s?b
-standard swap areas
-.It Pa /etc/rc.conf
-boot-time system configuration
-.El
-.Sh BUGS
-Because the file system layer is already dead by the time a crash dump
-is taken, it is not possible to send crash dumps directly to a file.
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Fx 2.1 .
+.Sh BUGS
+Because the file system layer is already dead by the time a crash dump
+is taken, it is not possible to send crash dumps directly to a file.
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index 4508c5f908a8..99636ea0a48e 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -119,12 +119,6 @@ is provided, output will be sent to stdout.
 will dump
 .Pa /dev/vinum/testvol
 with all available information.
-.Sh BUGS
-Snapshots are handled like plain files.
-They should get their own level to provide for independent control of the
-amount of what gets dumped.
-It probably also makes sense to some extend to dump the snapshot as a
-file system.
 .Sh SEE ALSO
 .Xr disklabel 8 ,
 .Xr dumpfs 8 ,
@@ -133,12 +127,18 @@ file system.
 .Xr newfs 8 ,
 .Xr tunefs 8 ,
 .Xr vinum 8
-.Sh AUTHORS
-.An Christoph Herrmann Aq chm@FreeBSD.org
-.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
-.An The GROWFS team Aq growfs@Tomsoft.COM
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 4.4 .
+.Sh AUTHORS
+.An Christoph Herrmann Aq chm@FreeBSD.org
+.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
+.An The GROWFS team Aq growfs@Tomsoft.COM
+.Sh BUGS
+Snapshots are handled like plain files.
+They should get their own level to provide for independent control of the
+amount of what gets dumped.
+It probably also makes sense to some extend to dump the snapshot as a
+file system.
diff --git a/sbin/fsck_msdosfs/fsck_msdosfs.8 b/sbin/fsck_msdosfs/fsck_msdosfs.8
index 489906407d9a..4880c5b53f8a 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -114,13 +114,13 @@ as the answer to all operator questions.
 .Xr fsck 8 ,
 .Xr fsck_ffs 8 ,
 .Xr mount_msdosfs 8
-.Sh BUGS
-The
-.Nm
-utility is
-.Ud .
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 4.4 .
+.Sh BUGS
+The
+.Nm
+utility is
+.Ud .
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 194ba830c868..a8f52f76f7da 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -225,15 +225,6 @@ Exit the program.
 .Xr fs 5 ,
 .Xr clri 8 ,
 .Xr fsck 8
-.Sh BUGS
-Manipulation of ``short'' symlinks doesn't work (in particular, don't
-try changing a symlink's type).
-.Pp
-You must specify modes as numbers rather than symbolic names.
-.Pp
-There are a bunch of other things that you might want to do which
-.Nm
-doesn't implement.
 .Sh HISTORY
 The
 .Nm
@@ -250,6 +241,15 @@ written by
 .An Peter Wemm
 ported it to
 .Fx .
+.Sh BUGS
+Manipulation of ``short'' symlinks doesn't work (in particular, don't
+try changing a symlink's type).
+.Pp
+You must specify modes as numbers rather than symbolic names.
+.Pp
+There are a bunch of other things that you might want to do which
+.Nm
+doesn't implement.
 .Sh WARNING
 Use this tool with extreme caution--you can damage an FFS file system
 beyond what
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index 4e729a2fca57..f13a789e5de0 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -153,6 +153,8 @@ This can be set to a number between 0 and 3 inclusive.
 If set to 0 minimal debug information is printed, and if set to 3 the
 maximum amount of debug information is printed.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to configure four disks for automatic
 concatenation, create a file system on it, and mount it:
@@ -165,8 +167,6 @@ umount /mnt
 gconcat stop data
 gconcat unload
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr loader.conf 5 ,
diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index 0fb4d95e33de..5af957213bcb 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -178,6 +178,8 @@ This can be set to a number between 0 and 2 inclusive.
 If set to 0 minimal debug information is printed, and if set to 2 the
 maximum amount of debug information is printed.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to set up a label for disk
 .Dq Li da2 ,
@@ -197,8 +199,6 @@ The next example shows how to set up a label for a UFS file system:
 tunefs -L data /dev/da4s1a
 mount /dev/ufs/data /mnt/data
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr loader.conf 5 ,
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index 350df8e1a02c..a90634ceca45 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -220,6 +220,8 @@ Additional options include:
 .It Fl v
 Be more verbose.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 Use 3 disks to setup a mirror.
 Choose split balance algorithm, split only
@@ -268,8 +270,6 @@ gmirror deactivate data da1
 dd if=/dev/da1 of=/backup/data.img bs=1m
 gmirror activate data da1
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr geom 8 ,
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index dfa209c4c9c9..90f72bfbe355 100644
--- a/sbin/geom/class/nop/gnop.8
+++ b/sbin/geom/class/nop/gnop.8
@@ -128,6 +128,8 @@ This can be set to a number between 0 and 2 inclusive.
 If set to 0 minimal debug information is printed, and if set to 2 the
 maximum amount of debug information is printed.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to create a transparent provider for disk
 .Pa /dev/da0
@@ -136,8 +138,6 @@ with 50% failure probability, and how to destroy it.
 gnop create -v -f 50 da0
 gnop destroy -v da0.nop
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr geom 8
diff --git a/sbin/geom/class/raid3/graid3.8 b/sbin/geom/class/raid3/graid3.8
index 16669fe16c58..69da6e774359 100644
--- a/sbin/geom/class/raid3/graid3.8
+++ b/sbin/geom/class/raid3/graid3.8
@@ -191,6 +191,8 @@ Additional options include:
 .It Fl v
 Be more verbose.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 Use 3 disks to setup a RAID3 array (with the round-robin reading feature).
 Create a file system, mount it, then unmount it and stop device:
@@ -217,8 +219,6 @@ Replace one data disk with a brand new one:
 graid3 remove -n 0 data
 graid3 insert -n 0 data da5
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr geom 8 ,
diff --git a/sbin/geom/class/shsec/gshsec.8 b/sbin/geom/class/shsec/gshsec.8
index 14e8a46400c2..2751cdc6dba7 100644
--- a/sbin/geom/class/shsec/gshsec.8
+++ b/sbin/geom/class/shsec/gshsec.8
@@ -101,6 +101,8 @@ Hardcode providers' names in metadata.
 .It Fl v
 Be more verbose.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to created a shared secret device.
 Secret will be split between a slice on the local disk and a USB Pen drive.
@@ -113,8 +115,6 @@ From now on, when USB Pen drive will be inserted, it will be automatically
 detected and connected making secret available via
 .Pa /dev/shsec/secret
 device.
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr gbde 8 ,
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index 9e6b720c39ea..b9f10e3428b7 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -190,6 +190,8 @@ If this value is large, you should consider increasing the
 .Va kern.geom.stripe.maxmem
 value.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to set up a striped device from four disks with a
 4 KB stripe size for automatic configuration,
@@ -204,8 +206,6 @@ umount /mnt
 gstripe stop data
 gstripe unload
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh COMPATIBILITY
 The
 .Nm
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 2ac8d41374a7..6e214fbdfe4f 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -94,6 +94,8 @@ RAID3
 .It
 STRIPE
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 The following example shows how to set up a stripe on three disks for automatic
 configuration:
@@ -112,8 +114,6 @@ Unload a kernel module which implements the MD class:
 .Bd -literal -offset indent
 geom md unload
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, and 1 if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr gconcat 8 ,
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 52c2cd5e1c41..dd7d7cca003f 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -150,6 +150,13 @@ Remote host to connect to.
 .It Ar path
 Path to a regular file or device.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, or 1 if the command fails.
+To get details about the failure,
+.Nm
+should be called with the
+.Fl v
+option.
 .Sh EXAMPLES
 Made use of CD-ROM device from remote host.
 .Bd -literal -offset indent
@@ -161,13 +168,6 @@ client# ggatec create -o ro server /dev/acd0
 ggate0
 client# mount_cd9660 /dev/ggate0 /cdrom
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, or 1 if the command fails.
-To get details about the failure,
-.Nm
-should be called with the
-.Fl v
-option.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr ggated 8 ,
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index c1fd97633134..3024a04230d7 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -86,13 +86,6 @@ The format of an exports file is as follows:
 1.2.3.0/24	RW	/tmp/test.img
 hostname	WO	/tmp/image
 .Ed
-.Sh EXAMPLES
-Export CD-ROM device and a file:
-.Bd -literal -offset indent
-# echo "1.2.3.0/24 RO /dev/acd0" > /etc/gg.exports
-# echo "client RW /image" >> /etc/gg.exports
-# ggated
-.Ed
 .Sh EXIT STATUS
 Exit status is 0 on success, or 1 if the command fails.
 To get details about the failure,
@@ -100,6 +93,13 @@ To get details about the failure,
 should be called with the
 .Fl v
 option.
+.Sh EXAMPLES
+Export CD-ROM device and a file:
+.Bd -literal -offset indent
+# echo "1.2.3.0/24 RO /dev/acd0" > /etc/gg.exports
+# echo "client RW /image" >> /etc/gg.exports
+# ggated
+.Ed
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr ggatec 8 ,
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index b28abbb2e89b..01b964a947e6 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -121,6 +121,13 @@ output.
 .It Ar path
 Path to a regular file or device.
 .El
+.Sh EXIT STATUS
+Exit status is 0 on success, or 1 if the command fails.
+To get details about the failure,
+.Nm
+should be called with the
+.Fl v
+option.
 .Sh EXAMPLES
 .Dq GEOMify
 the
@@ -139,13 +146,6 @@ umount /secret
 gbde detach ggate5
 ggatel destroy -u 5
 .Ed
-.Sh EXIT STATUS
-Exit status is 0 on success, or 1 if the command fails.
-To get details about the failure,
-.Nm
-should be called with the
-.Fl v
-option.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr gbde 8 ,
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 7c5e1cff9719..387e5114bdc0 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -116,6 +116,24 @@ will enlarge
 .Pa /dev/vinum/testvol
 up to 2GB if there is enough space in
 .Pa /dev/vinum/testvol .
+.Sh SEE ALSO
+.Xr bsdlabel 8 ,
+.Xr dumpfs 8 ,
+.Xr fdisk 8 ,
+.Xr ffsinfo 8 ,
+.Xr fsck 8 ,
+.Xr newfs 8 ,
+.Xr tunefs 8 ,
+.Xr vinum 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 4.4 .
+.Sh AUTHORS
+.An Christoph Herrmann Aq chm@FreeBSD.org
+.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
+.An The GROWFS team Aq growfs@Tomsoft.COM
 .Sh BUGS
 The
 .Nm
@@ -176,21 +194,3 @@ This read operation will provide unexpected data when using
 .Fl N .
 Therefore, this part cannot really be simulated and will be skipped in test
 mode.
-.Sh SEE ALSO
-.Xr bsdlabel 8 ,
-.Xr dumpfs 8 ,
-.Xr fdisk 8 ,
-.Xr ffsinfo 8 ,
-.Xr fsck 8 ,
-.Xr newfs 8 ,
-.Xr tunefs 8 ,
-.Xr vinum 8
-.Sh AUTHORS
-.An Christoph Herrmann Aq chm@FreeBSD.org
-.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
-.An The GROWFS team Aq growfs@Tomsoft.COM
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Fx 4.4 .
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index d0da69dd2174..b85a7a719fd8 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -934,19 +934,6 @@ it (or have need for it).
 Messages indicating the specified interface does not exist, the
 requested address is unknown, or the user is not privileged and
 tried to alter an interface's configuration.
-.Sh BUGS
-Basic IPv6 node operation requires a link-local address on each
-interface configured for IPv6.
-Normally, such an address is automatically configured by the
-kernel on each interface added to the system; this behaviour may
-be disabled by setting the sysctl MIB variable
-.Va net.inet6.ip6.auto_linklocal
-to 0.
-.Pp
-If you delete such an address using
-.Nm ,
-the kernel may act very oddly.
-Do this at your own risk.
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr netintro 4 ,
@@ -960,3 +947,16 @@ The
 .Nm
 utility appeared in
 .Bx 4.2 .
+.Sh BUGS
+Basic IPv6 node operation requires a link-local address on each
+interface configured for IPv6.
+Normally, such an address is automatically configured by the
+kernel on each interface added to the system; this behaviour may
+be disabled by setting the sysctl MIB variable
+.Va net.inet6.ip6.auto_linklocal
+to 0.
+.Pp
+If you delete such an address using
+.Nm ,
+the kernel may act very oddly.
+Do this at your own risk.
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 4f0868342407..563f3c0248a3 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -353,23 +353,6 @@ as follows:
 .Xr ttys 5
 file
 .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.
-.Bf -emphasis
-Init will sleep for 30 seconds,
-then continue trying to start the process.
-.Ef
-.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.shutdown -compact
 .It Pa /dev/console
@@ -388,6 +371,23 @@ system startup commands
 .It Pa /etc/rc.shutdown
 system shutdown commands
 .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.
+.Bf -emphasis
+Init will sleep for 30 seconds,
+then continue trying to start the process.
+.Ef
+.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/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index dbc9084e2ff6..bce358cc42f9 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -553,6 +553,21 @@ or in short form without timestamps:
 .Xr reboot 8 ,
 .Xr sysctl 8 ,
 .Xr syslogd 8
+.Sh HISTORY
+A
+.Nm
+utility first appeared in
+.Fx 4.0 .
+.Sh AUTHORS
+.An Ugen J. S. Antsilevich ,
+.An Poul-Henning Kamp ,
+.An Alex Nash ,
+.An Archie Cobbs .
+.Pp
+.An -nosplit
+API based upon code written by
+.An Daniel Boulet
+for BSDI.
 .Sh BUGS
 .Em WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!
 .Pp
@@ -565,18 +580,3 @@ do anything you don't understand.
 .Pp
 When manipulating/adding chain entries, service and protocol names are
 not accepted.
-.Sh AUTHORS
-.An Ugen J. S. Antsilevich ,
-.An Poul-Henning Kamp ,
-.An Alex Nash ,
-.An Archie Cobbs .
-.Pp
-.An -nosplit
-API based upon code written by
-.An Daniel Boulet
-for BSDI.
-.Sh HISTORY
-A
-.Nm
-utility first appeared in
-.Fx 4.0 .
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index cfceeb093e2f..620f32cdbf30 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -2334,6 +2334,33 @@ the sleep terminates thus restoring the previous situation.
 .Xr reboot 8 ,
 .Xr sysctl 8 ,
 .Xr syslogd 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 2.0 .
+.Xr dummynet 4
+was introduced in
+.Fx 2.2.8 .
+Stateful extensions were introduced in
+.Fx 4.0 .
+.Nm ipfw2
+was introduced in Summer 2002.
+.Sh AUTHORS
+.An Ugen J. S. Antsilevich ,
+.An Poul-Henning Kamp ,
+.An Alex Nash ,
+.An Archie Cobbs ,
+.An Luigi Rizzo .
+.Pp
+.An -nosplit
+API based upon code written by
+.An Daniel Boulet
+for BSDI.
+.Pp
+Work on
+.Xr dummynet 4
+traffic shaper supported by Akamba Corp.
 .Sh BUGS
 The syntax has grown over the years and sometimes it might be confusing.
 Unfortunately, backward compatibility prevents cleaning up mistakes
@@ -2363,30 +2390,3 @@ If a packet is reinserted in this manner, later rules may be incorrectly
 applied, making the order of
 .Cm divert
 rules in the rule sequence very important.
-.Sh AUTHORS
-.An Ugen J. S. Antsilevich ,
-.An Poul-Henning Kamp ,
-.An Alex Nash ,
-.An Archie Cobbs ,
-.An Luigi Rizzo .
-.Pp
-.An -nosplit
-API based upon code written by
-.An Daniel Boulet
-for BSDI.
-.Pp
-Work on
-.Xr dummynet 4
-traffic shaper supported by Akamba Corp.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Fx 2.0 .
-.Xr dummynet 4
-was introduced in
-.Fx 2.2.8 .
-Stateful extensions were introduced in
-.Fx 4.0 .
-.Nm ipfw2
-was introduced in Summer 2002.
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index fe5c8021a423..afefb25d4d29 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -412,16 +412,6 @@ Verbose mode.
 .It Fl w
 The file system object is to be read and write.
 .El
-.Sh DIAGNOSTICS
-Various, most of them are self-explanatory.
-.Pp
-.Dl XXXXX file system is not available
-.Pp
-The kernel does not support the respective file system type.
-Note that
-support for a particular file system might be provided either on a static
-(kernel compile-time), or dynamic basis (loaded as a kernel module by
-.Xr kldload 8 ) .
 .Sh ENVIRONMENT
 .Bl -tag -width ".Ev PATH_FSTAB"
 .It Ev PATH_FSTAB
@@ -441,6 +431,16 @@ for more information.)
 .It Pa /etc/fstab
 file system table
 .El
+.Sh DIAGNOSTICS
+Various, most of them are self-explanatory.
+.Pp
+.Dl XXXXX file system is not available
+.Pp
+The kernel does not support the respective file system type.
+Note that
+support for a particular file system might be provided either on a static
+(kernel compile-time), or dynamic basis (loaded as a kernel module by
+.Xr kldload 8 ) .
 .Sh SEE ALSO
 .Xr getfacl 1 ,
 .Xr setfacl 1 ,
@@ -468,8 +468,6 @@ file system table
 .Xr mount_umapfs 8 ,
 .Xr mount_unionfs 8 ,
 .Xr umount 8
-.Sh BUGS
-It is possible for a corrupted file system to cause a crash.
 .Sh CAVEATS
 After a successful
 .Nm ,
@@ -484,3 +482,5 @@ A
 .Nm
 utility appeared in
 .At v1 .
+.Sh BUGS
+It is possible for a corrupted file system to cause a crash.
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 416d5896a3b0..7970ddd0975d 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -140,15 +140,6 @@ The following command can be used to mount a Kodak Photo-CD:
 .Xr unmount 2 ,
 .Xr fstab 5 ,
 .Xr mount 8
-.Sh BUGS
-POSIX device node mapping is currently not supported.
-.Pp
-Version numbers are not stripped if Rockridge extensions are in use.
-In this case, accessing files that don't have Rockridge names without
-version numbers gets the one with the lowest version number and not
-the one with the highest.
-.Pp
-There is no ECMA support.
 .Sh HISTORY
 The
 .Nm
@@ -158,3 +149,12 @@ utility first appeared in
 The Unicode conversion routine was added by
 .An Ryuichiro Imura Aq imura@ryu16.org
 in 2003.
+.Sh BUGS
+POSIX device node mapping is currently not supported.
+.Pp
+Version numbers are not stripped if Rockridge extensions are in use.
+In this case, accessing files that don't have Rockridge names without
+version numbers gets the one with the lowest version number and not
+the one with the highest.
+.Pp
+There is no ECMA support.
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 03060debda6b..752040ff48e6 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -237,6 +237,11 @@ is that vnode arguments must be manually mapped.
 .Pp
 UCLA Technical Report CSD-910056,
 .Em "Stackable Layers: an Architecture for File System Development" .
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Bx 4.4 .
 .Sh BUGS
 THIS FILE SYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.
@@ -250,8 +255,3 @@ hackers can apply by sending mail to
 .Aq hackers@FreeBSD.org
 and announcing
 their intent to take it over.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Bx 4.4 .
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index 1fe47657ce56..1bbaadb84bcf 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -126,6 +126,11 @@ sophisticated.
 .Sh SEE ALSO
 .Xr mount 8 ,
 .Xr mount_nullfs 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Bx 4.4 .
 .Sh BUGS
 THIS FILE SYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.
@@ -139,8 +144,3 @@ hackers can apply by sending mail to
 .Aq hackers@FreeBSD.org
 and announcing
 their intent to take it over.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Bx 4.4 .
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 9bdcbe04f691..20f1451aa884 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -181,6 +181,13 @@ accessible via
 .Xr fstab 5 ,
 .Xr mount 8 ,
 .Xr mount_nullfs 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Bx 4.4 .
+It first worked in
+.Fx Ns -(fill this in) .
 .Sh BUGS
 THIS FILE SYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.
@@ -207,10 +214,3 @@ Running
 .Xr find 1
 over a union tree has the side-effect of creating
 a tree of shadow directories in the upper layer.
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Bx 4.4 .
-It first worked in
-.Fx Ns -(fill this in) .
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 9c6e0024aeed..a7de7ab5eccc 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -162,6 +162,8 @@ struct bsxbpb {
     u_int16_t	bkbs;		/* [-k] backup boot sector */
 };
 .Ed
+.Sh EXIT STATUS
+Exit status is 0 on success and 1 on error.
 .Sh EXAMPLES
 .Bd -literal -offset indent
 newfs_msdos /dev/ad0s1
@@ -182,8 +184,6 @@ on
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
 .Xr newfs 8
-.Sh EXIT STATUS
-Exit status is 0 on success and 1 on error.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 9e7b9ae02692..f37c42829639 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -79,8 +79,6 @@ tunnel mode nos
 tunnel destination 192.168.59.34
 tunnel source 192.168.56.45
 .Ed
-.Sh BUGS
-We don't allow for setting our source address for multihomed machines.
 .Sh AUTHORS
 .An -nosplit
 .An Nickolay N. Dudorov Aq nnd@itfs.nsk.su
@@ -89,3 +87,5 @@ wrote the program,
 wrote the man-page.
 .An Isao SEKI Aq iseki@gongon.com
 added a new flag, IP protocol number.
+.Sh BUGS
+We don't allow for setting our source address for multihomed machines.
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index d7b89c9ef4af..625af932cb17 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -291,17 +291,6 @@ default kernel
 .It Pa /boot/kernel.old/kernel
 typical non-default kernel (optional)
 .El
-.Sh SEE ALSO
-.Xr ddb 4 ,
-.Xr ttys 5 ,
-.Xr boot0cfg 8 ,
-.Xr bsdlabel 8 ,
-.Xr btxld 8 ,
-.Xr config 8 ,
-.Xr halt 8 ,
-.Xr loader 8 ,
-.Xr reboot 8 ,
-.Xr shutdown 8
 .Sh DIAGNOSTICS
 When disk-related errors occur, these are reported by the second-stage
 bootstrap using the same error codes returned by the BIOS, for example
@@ -341,6 +330,17 @@ When a
 .Dq Disk error 0x1
 is reported by the second-stage bootstrap, it generally means that this
 requirement has not been adhered to.
+.Sh SEE ALSO
+.Xr ddb 4 ,
+.Xr ttys 5 ,
+.Xr boot0cfg 8 ,
+.Xr bsdlabel 8 ,
+.Xr btxld 8 ,
+.Xr config 8 ,
+.Xr halt 8 ,
+.Xr loader 8 ,
+.Xr reboot 8 ,
+.Xr shutdown 8
 .Sh BUGS
 The
 .Xr bsdlabel 5
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 1d5776021272..938de5f5f7a3 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -367,6 +367,24 @@ 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
+.Bl -tag -width ".Ev TMPDIR"
+.It Ev TAPE
+Device from which to read backup.
+.It Ev TMPDIR
+Name of directory where temporary files are to be created.
+.El
+.Sh FILES
+.Bl -tag -width "./restoresymtable" -compact
+.It Pa /dev/sa0
+the default tape drive
+.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
 The
 .Nm
@@ -438,29 +456,16 @@ After a dump read error,
 may have to resynchronize itself.
 This message lists the number of blocks that were skipped over.
 .El
-.Sh FILES
-.Bl -tag -width "./restoresymtable" -compact
-.It Pa /dev/sa0
-the default tape drive
-.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 ENVIRONMENT
-.Bl -tag -width ".Ev TMPDIR"
-.It Ev TAPE
-Device from which to read backup.
-.It Ev TMPDIR
-Name of directory where temporary files are to be created.
-.El
 .Sh SEE ALSO
 .Xr dump 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr rmt 8
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Bx 4.2 .
 .Sh BUGS
 The
 .Nm
@@ -502,8 +507,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
-utility appeared in
-.Bx 4.2 .
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 45ffd195cd14..ba17bccd749e 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -355,6 +355,8 @@ and
 .Dv RTM_CHANGE .
 As such, only the super-user may modify
 the routing tables.
+.Sh EXIT STATUS
+.Ex -std
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "add [host \&| network ] %s: gateway %s flags %x"
@@ -393,8 +395,6 @@ operation resulted in a route whose gateway uses the
 same route as the one being changed.
 The next-hop gateway should be reachable through a different route.
 .El
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .\".Xr esis 4 ,
 .Xr netintro 4 ,
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index afee816fdee9..25998c9bd83c 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -720,9 +720,6 @@ for distant gateways
 .%R XSIS 028112
 .%Q Xerox System Integration Standard
 .Re
-.Sh BUGS
-It does not always detect unidirectional failures in network interfaces,
-for example, when the output side fails.
 .Sh HISTORY
 The
 .Nm
@@ -730,3 +727,6 @@ utility appeared in
 .Bx 4.2 .
 .\"  LocalWords:  loopback ICMP rtquery ifconfig multicasting Solicitations RIPv
 .\"  LocalWords:  netstat rdisc
+.Sh BUGS
+It does not always detect unidirectional failures in network interfaces,
+for example, when the output side fails.
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index a17091c5ee67..c15c724f3ef2 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -132,8 +132,6 @@ is meant to be called near the end of the initialization file
 .Pa /etc/rc
 (see
 .Xr rc 8 ) .
-.Sh BUGS
-The minfree code does not consider the effect of compression or sparse files.
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr getbootfile 3 ,
@@ -144,3 +142,5 @@ The
 .Nm
 utility appeared in
 .Bx 4.1 .
+.Sh BUGS
+The minfree code does not consider the effect of compression or sparse files.
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 616deb6165e9..fbccd7193267 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -229,6 +229,19 @@ If you use a hard-wired connection rather than a modem, invoke
 with the
 .Fl l
 option in order to ignore carrier on the slip line.
+.Sh FILES
+.Bl -tag -width /usr/share/examples/slattach/* -compact
+.It Pa /var/run/slattach.<tty>.pid
+with
+.Ar tty
+replaced by the terminal path name component of
+.Ar ttyname .
+This file contains the numerical process ID of the
+.Nm
+process and can be examined by scripts in order to send a signal to
+.Nm
+.It Pa /usr/share/examples/slattach/*
+.El
 .Sh EXAMPLES
 .Bd -literal -offset indent -compact
 slattach ttyd8
@@ -251,19 +264,6 @@ also logs failure to set the controlling terminal or failure to install
 signal handlers.
 Upon connection and redial the ttyname and baud rate
 are logged and on shutdown the ttyname is logged.
-.Sh FILES
-.Bl -tag -width /usr/share/examples/slattach/* -compact
-.It Pa /var/run/slattach.<tty>.pid
-with
-.Ar tty
-replaced by the terminal path name component of
-.Ar ttyname .
-This file contains the numerical process ID of the
-.Nm
-process and can be examined by scripts in order to send a signal to
-.Nm
-.It Pa /usr/share/examples/slattach/*
-.El
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr startslip 1 ,
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 283912284cc0..73e17e160989 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -146,16 +146,6 @@ environment variable is used if not specifically
 overridden.
 512 byte blocks are used by default.
 .El
-.Sh DIAGNOSTICS
-These utilities may fail for the reasons described in
-.Xr swapon 2 .
-.Sh SEE ALSO
-.Xr swapon 2 ,
-.Xr fstab 5 ,
-.Xr init 8 ,
-.Xr mdconfig 8 ,
-.Xr pstat 8 ,
-.Xr rc 8
 .Sh FILES
 .Bl -tag -width ".Pa /dev/{ad,da}?s?b" -compact
 .It Pa /dev/{ad,da}?s?b
@@ -166,6 +156,16 @@ memory disk devices
 .Tn ASCII
 file system description table
 .El
+.Sh DIAGNOSTICS
+These utilities may fail for the reasons described in
+.Xr swapon 2 .
+.Sh SEE ALSO
+.Xr swapon 2 ,
+.Xr fstab 5 ,
+.Xr init 8 ,
+.Xr mdconfig 8 ,
+.Xr pstat 8 ,
+.Xr rc 8
 .Sh HISTORY
 The
 .Nm swapon
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 44fefa05c823..31e944a389d9 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -235,6 +235,25 @@ denote
 .It "user.stream_max	integer	no
 .It "user.tzname_max	integer	no
 .El
+.Sh FILES
+.Bl -tag -width ".In netinet/icmp_var.h" -compact
+.It In sys/sysctl.h
+definitions for top level identifiers, second level kernel and hardware
+identifiers, and user level identifiers
+.It In sys/socket.h
+definitions for second level network identifiers
+.It In sys/gmon.h
+definitions for third level profiling identifiers
+.It In vm/vm_param.h
+definitions for second level virtual memory identifiers
+.It In netinet/in.h
+definitions for third level Internet identifiers and
+fourth level IP identifiers
+.It In netinet/icmp_var.h
+definitions for fourth level ICMP identifiers
+.It In netinet/udp_var.h
+definitions for fourth level UDP identifiers
+.El
 .Sh EXAMPLES
 For example, to retrieve the maximum number of processes allowed
 in the system, one would use the following request:
@@ -265,25 +284,6 @@ Information about the load average history may be obtained with:
 More variables than these exist, and the best and likely only place
 to search for their deeper meaning is undoubtedly the source where
 they are defined.
-.Sh FILES
-.Bl -tag -width ".In netinet/icmp_var.h" -compact
-.It In sys/sysctl.h
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
-.It In sys/socket.h
-definitions for second level network identifiers
-.It In sys/gmon.h
-definitions for third level profiling identifiers
-.It In vm/vm_param.h
-definitions for second level virtual memory identifiers
-.It In netinet/in.h
-definitions for third level Internet identifiers and
-fourth level IP identifiers
-.It In netinet/icmp_var.h
-definitions for fourth level ICMP identifiers
-.It In netinet/udp_var.h
-definitions for fourth level UDP identifiers
-.El
 .Sh COMPATIBILITY
 The
 .Fl w
@@ -293,13 +293,6 @@ option has been deprecated and is silently ignored.
 .Xr loader.conf 5 ,
 .Xr sysctl.conf 5 ,
 .Xr loader 8
-.Sh BUGS
-The
-.Nm
-utility presently exploits an undocumented interface to the kernel
-sysctl facility to traverse the sysctl tree and to retrieve format
-and name information.
-This correct interface is being thought about for the time being.
 .Sh HISTORY
 A
 .Nm
@@ -310,3 +303,10 @@ In
 .Fx 2.2 ,
 .Nm
 was significantly remodeled.
+.Sh BUGS
+The
+.Nm
+utility presently exploits an undocumented interface to the kernel
+sysctl facility to traverse the sysctl tree and to retrieve format
+and name information.
+This correct interface is being thought about for the time being.
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index f84ea7b3e707..3a1dd51e3a29 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -155,14 +155,14 @@ specified mount point.
 .%D August 1984
 .%O "(reprinted in the BSD System Manager's Manual, SMM:5)"
 .Re
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Bx 4.2 .
 .Sh BUGS
 This utility should work on active file systems.
 .\" Take this out and a Unix Daemon will dog your steps from now until
 .\" the time_t's wrap around.
 .Pp
 You can tune a file system, but you can't tune a fish.
-.Sh HISTORY
-The
-.Nm
-utility appeared in
-.Bx 4.2 .