From 8cf461a5aa9d8b0a50cdbd40a90abe58edc39961 Mon Sep 17 00:00:00 2001
From: aaron <aaron@openbsd.org>
Date: Sun, 5 Mar 2000 00:28:49 +0000
Subject: [PATCH] Finish standardizing options list introduction.

---
 bin/df/df.1                             |  4 ++--
 bin/pax/cpio.1                          |  4 ++--
 bin/pax/pax.1                           |  4 ++--
 sbin/dump/dump.8                        |  5 ++---
 sbin/fdisk/fdisk.8                      | 17 +++++++----------
 sbin/fsirand/fsirand.8                  |  6 +++---
 sbin/ipf/ipf.8                          |  4 ++--
 sbin/modload/modload.8                  |  6 ++----
 sbin/mount/mount.8                      |  4 ++--
 sbin/ncheck_ffs/ncheck_ffs.8            | 13 ++++++-------
 sbin/nfsd/nfsd.8                        |  4 ++--
 sbin/raidctl/raidctl.8                  |  6 ++----
 sbin/scan_ffs/scan_ffs.8                |  4 ++--
 sbin/scsi/scsi.8                        |  4 ++--
 sbin/swapctl/swapctl.8                  | 16 ++++++++--------
 usr.bin/cdio/cdio.1                     |  4 ++--
 usr.bin/cmp/cmp.1                       |  4 ++--
 usr.bin/comm/comm.1                     | 10 ++++++----
 usr.bin/encrypt/encrypt.1               |  4 ++--
 usr.bin/fmt/fmt.1                       |  4 ++--
 usr.bin/from/from.1                     |  4 ++--
 usr.bin/gprof/gprof.1                   |  4 ++--
 usr.bin/join/join.1                     | 15 ++++++++-------
 usr.bin/locate/locate/locate.1          |  6 +++---
 usr.bin/locate/locate/locate.updatedb.8 |  6 +++---
 usr.bin/mktemp/mktemp.1                 |  6 +++---
 usr.bin/msgs/msgs.1                     | 24 ++++++++++++++++--------
 usr.bin/newsyslog/newsyslog.8           |  7 +++----
 usr.bin/readlink/readlink.1             |  4 ++--
 usr.bin/rup/rup.1                       |  4 ++--
 usr.bin/rusers/rusers.1                 |  4 ++--
 usr.bin/sed/sed.1                       |  4 ++--
 usr.bin/skeyaudit/skeyaudit.1           |  8 ++++----
 usr.bin/sort/sort.1                     |  4 ++--
 usr.bin/tee/tee.1                       | 12 ++++++------
 usr.bin/tn3270/tn3270/tn3270.1          |  6 ++----
 usr.bin/touch/touch.1                   |  4 ++--
 usr.bin/tr/tr.1                         |  4 ++--
 usr.bin/ul/ul.1                         |  8 ++++----
 usr.bin/uname/uname.1                   |  4 ++--
 usr.bin/uniq/uniq.1                     |  4 ++--
 usr.bin/wc/wc.1                         |  4 ++--
 usr.bin/yacc/yacc.1                     |  4 ++--
 usr.sbin/afs/afsd/afsd.8                |  4 ++--
 usr.sbin/apm/apm.8                      |  5 ++---
 usr.sbin/ipftest/ipftest.1              |  4 ++--
 usr.sbin/pstat/pstat.8                  |  2 +-
 usr.sbin/sa/sa.8                        |  8 +++-----
 usr.sbin/sesd/sesd/sesd.8               |  4 ++--
 usr.sbin/trpt/trpt.8                    |  8 ++++----
 usr.sbin/trsp/trsp.8                    |  6 +++---
 51 files changed, 157 insertions(+), 161 deletions(-)

diff --git a/bin/df/df.1 b/bin/df/df.1
index 328e9c91722..630439493c9 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: df.1,v 1.20 2000/02/19 22:44:16 aaron Exp $
+.\"	$OpenBSD: df.1,v 1.21 2000/03/05 00:28:51 aaron Exp $
 .\"	$NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -68,7 +68,7 @@ and
 .Fl t
 options below).
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl h
 "Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index df9acbe4b21..53ae6d27dc4 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: cpio.1,v 1.8 1999/06/04 02:45:14 aaron Exp $
+.\"	$OpenBSD: cpio.1,v 1.9 2000/03/05 00:28:52 aaron Exp $
 .\"
 .Dd February 16, 1997
 .Dt CPIO 1
@@ -67,7 +67,7 @@ command copies files to and from a
 .Nm
 archive.
 .Pp
-The following options are supported:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl o
 Create an archive.  Reads the list of files to store in the
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 77eb8c78852..bd7dac96701 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.15 1999/07/06 11:20:46 aaron Exp $
+.\"	$OpenBSD: pax.1,v 1.16 2000/03/05 00:28:52 aaron Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -331,7 +331,7 @@ will write these
 operand pathnames in a diagnostic message to standard error
 and then exit with a non-zero exit status.
 .Sh OPTIONS
-The following options are supported:
+The options are as follows:
 .Bl -tag -width 4n
 .It Fl r
 Read an archive file from standard input
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 4478023abb8..90ed136eecf 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dump.8,v 1.21 1999/10/17 19:59:45 aaron Exp $
+.\"	$OpenBSD: dump.8,v 1.22 2000/03/05 00:28:49 aaron Exp $
 .\"	$NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -97,8 +97,7 @@ is ignored, the only dump level that is supported is
 .Fl 0 ,
 and all of the files must reside on the same filesystem.
 .Pp
-The following options are supported by
-.Nm dump :
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl 0\-9
 Dump levels.
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 4177ff342c6..a7419baf3de 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdisk.8,v 1.29 2000/01/22 02:17:53 aaron Exp $
+.\"	$OpenBSD: fdisk.8,v 1.30 2000/03/05 00:28:49 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\" All rights reserved.
@@ -57,21 +57,18 @@ in the first column), and if one
 is found, the boot block from that partition is loaded and executed in
 place of the original (MBR) boot block.
 .Pp
-The following options are available:
-.Pp
-.Bl -tag -width "-c cylinders" -compact
+The options are as follows:
+.Bl -tag -width "-c cylinders"
 .It Fl i
 Initialize the MBR sector.
-.Pp
 .It Fl e
 Edit existing MBR sectors.
-.Pp
 .It Fl f Ar mbrname
 Specifies an alternate MBR template file.
-.Pp
-.It Fl c Ar cylinders
-.It Fl h Ar heads
-.It Fl s Ar sectors
+.It Xo Fl c Ar cylinders ,
+.Fl h Ar heads ,
+.Fl s Ar sectors
+.Xc
 Specifies an alternate BIOS geometry for
 .Nm
 to use.
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index af2fdb710ec..d4dd3914196 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: fsirand.8,v 1.17 1999/07/04 18:59:39 aaron Exp $
+.\"	$OpenBSD: fsirand.8,v 1.18 2000/03/05 00:28:57 aaron Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
@@ -69,9 +69,9 @@ may be used on the root filesystem in single-user mode
 but the system should be rebooted via
 .Dq reboot -n
 afterwards.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
-The available options are as follows:
 .It Fl b
 Use the default block size (usually 512 bytes) instead
 of the value gleaned from the disklabel.
diff --git a/sbin/ipf/ipf.8 b/sbin/ipf/ipf.8
index 0ef81f48171..730d22715eb 100644
--- a/sbin/ipf/ipf.8
+++ b/sbin/ipf/ipf.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipf.8,v 1.20 2000/02/19 21:46:46 aaron Exp $
+.\"	$OpenBSD: ipf.8,v 1.21 2000/03/05 00:28:50 aaron Exp $
 .Dd January 6, 2000
 .Dt IPF 8
 .Os
@@ -119,7 +119,7 @@ proposed changes to the active ruleset (see
 .Fl I
 option below).
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl A
 Apply changes to the active ruleset. This is the default.
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 21b04e89038..d221d6c47f0 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modload.8,v 1.13 1999/10/05 20:53:10 aaron Exp $
+.\"	$OpenBSD: modload.8,v 1.14 2000/03/05 00:28:56 aaron Exp $
 .\"	$NetBSD: modload.8,v 1.5 1995/03/18 14:56:43 cgd Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -46,9 +46,7 @@ The
 utility loads a loadable kernel module into a running system.
 The input file is an object file (.o file).
 .Pp
-The options to
-.Nm
-are as follows:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl d
 Debug.  Used to debug
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index e590ba7c038..3a088cef9bf 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.18 1999/07/21 01:07:54 deraadt Exp $
+.\"	$OpenBSD: mount.8,v 1.19 2000/03/05 00:28:50 aaron Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -113,7 +113,7 @@ a filesystem mount status from read-write to read-only.
 Options are specified with a
 .Fl o
 flag followed by a comma separated string of options.
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It async
 All
diff --git a/sbin/ncheck_ffs/ncheck_ffs.8 b/sbin/ncheck_ffs/ncheck_ffs.8
index eb996f995cd..98dee72681c 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.9 1999/10/05 20:53:10 aaron Exp $
+.\"	$OpenBSD: ncheck_ffs.8,v 1.10 2000/03/05 00:28:56 aaron Exp $
 .\"
 .\" Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
 .\" All rights reserved.
@@ -45,11 +45,7 @@ generates a list of filenames and inode numbers for the given
 file system.  Names of directories are followed by a
 .Dq \&. .
 .Pp
-The report is not sorted.
-.Pp
-The options to
-.Nm
-are as follows:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl i Ar numbers
 Report only those files whose inode numbers follows.
@@ -63,8 +59,11 @@ which are ordinarily skipped.
 Give more verbose information on inodes
 .It Fl s
 Report only special files and files with set-user-ID or set-group-ID
-set.  This is meant to find hidden violations of security policies.
+set.
+This is meant to find hidden violations of security policies.
 .El
+.Pp
+The report is not sorted.
 .Sh SEE ALSO
 .Xr sort 1 ,
 .Xr fsck 8
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index ce8d74e656b..f7a4df45436 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: nfsd.8,v 1.10 1999/07/21 01:07:56 deraadt Exp $
+.\"   $OpenBSD: nfsd.8,v 1.11 2000/03/05 00:28:50 aaron Exp $
 .\"   $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -59,7 +59,7 @@ Unless otherwise specified, four servers for
 .Tn UDP
 transport are started.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl r
 Register the
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index 8a97cb7db62..4a992d2094a 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.9 2000/01/07 14:51:41 peter Exp $
+.\"	$OpenBSD: raidctl.8,v 1.10 2000/03/05 00:28:56 aaron Exp $
 .\"     $NetBSD: raidctl.8,v 1.11 2000/01/05 03:02:41 oster Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -129,9 +129,7 @@ devices.  For more information about the RAIDframe disk device, see
 This document assumes the reader has at least rudimentary knowledge of
 RAID and RAID concepts.
 .Pp
-The command-line options for
-.Nm
-are as follows:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a Ar component Ar dev
 Add 
diff --git a/sbin/scan_ffs/scan_ffs.8 b/sbin/scan_ffs/scan_ffs.8
index 837a67a8f12..216f21deda1 100644
--- a/sbin/scan_ffs/scan_ffs.8
+++ b/sbin/scan_ffs/scan_ffs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scan_ffs.8,v 1.8 1999/07/03 02:11:08 aaron Exp $
+.\"	$OpenBSD: scan_ffs.8,v 1.9 2000/03/05 00:28:50 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Niklas Hallqvist, Tobias Weingartner
 .\" All rights reserved.
@@ -51,7 +51,7 @@ create) that covers the whole disk, and finds all probable UFS/FFS partitions
 on the disk.  It has various options to make it go faster, and to print out
 information to help in the reconstruction of the disklabel.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width "-b begin"
 .It Fl l
 This will make
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index a551841d25a..ec69ec500a7 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.8,v 1.14 2000/01/22 02:17:53 aaron Exp $
+.\"	$OpenBSD: scsi.8,v 1.15 2000/03/05 00:28:50 aaron Exp $
 .\"	$FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .\" Written By Julian ELischer
@@ -93,7 +93,7 @@ can be
 .Ql -
 to write input data to stdout.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl f Ar device
 Specifies the
diff --git a/sbin/swapctl/swapctl.8 b/sbin/swapctl/swapctl.8
index b1d5a364a15..fae881a5378 100644
--- a/sbin/swapctl/swapctl.8
+++ b/sbin/swapctl/swapctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: swapctl.8,v 1.8 2000/02/26 04:18:55 hugh Exp $
+.\"	$OpenBSD: swapctl.8,v 1.9 2000/03/05 00:28:51 aaron Exp $
 .\"	$NetBSD: swapctl.8,v 1.14 1998/05/22 18:27:52 msaitoh Exp $
 .\"
 .\" Copyright (c) 1997 Matthew R. Green
@@ -79,8 +79,8 @@ acts as
 with the
 .Fl A
 option.
-.Sh OPTIONS
-The following options are available:
+.Pp
+The options are as follows:
 .Bl -tag -width 123456
 .It Fl A
 This option causes
@@ -199,6 +199,11 @@ at all during system
 .Xr fsck 8
 and may run out of real memory, causing fsck to abnormally exit and
 startup scripts to fail.
+.Sh SEE ALSO
+.Xr swapctl 2 ,
+.Xr fstab 5 ,
+.Xr mount_nfs 8 ,
+.Xr vnconfig 8
 .Sh HISTORY
 The
 .Nm
@@ -224,8 +229,3 @@ option of
 .Nm
 are not currently supported by
 .Ox .
-.Sh SEE ALSO
-.Xr swapctl 2 ,
-.Xr fstab 5 ,
-.Xr mount_nfs 8 ,
-.Xr vnconfig 8
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index f518aa50290..2ffbc4b6335 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.15 1999/07/30 18:59:30 deraadt Exp $
+.\" $OpenBSD: cdio.1,v 1.16 2000/03/05 00:28:52 aaron Exp $
 .Dd July 3, 1995
 .Dt CDIO 1
 .Os
@@ -32,7 +32,7 @@ If no command is given,
 .Nm
 enters an interactive mode, reading commands from the standard input.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl s
 Silent mode. Do not print table headers or human-readable comments.
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 72de16cf064..abd6f065775 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: cmp.1,v 1.6 1999/07/04 11:53:52 aaron Exp $
+.\"     $OpenBSD: cmp.1,v 1.7 2000/03/05 00:28:52 aaron Exp $
 .\"     $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -60,7 +60,7 @@ and line number at which the first difference occurred is reported.
 .Pp
 Bytes and lines are numbered beginning with one.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl l
 Print the byte number (decimal) and the differing
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 94243707820..ec82036b787 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: comm.1,v 1.6 1999/07/07 10:50:07 aaron Exp $
+.\"	$OpenBSD: comm.1,v 1.7 2000/03/05 00:28:52 aaron Exp $
 .\"	$NetBSD: comm.1,v 1.4 1995/03/26 09:25:50 glass Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -62,9 +62,11 @@ lines only in
 .Ar file2 ;
 and lines in both files.
 .Pp
-The filename ``-'' means the standard input.
+The filename
+.Dq -
+means the standard input.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl 1
 Suppress printing of column 1.
@@ -93,7 +95,7 @@ participate in line comparisons.
 .\" .It Ev LC_COLLATE
 .\" .It Ev LC_MESSAGES
 .\" .El
-.Sh DIAGNOSTICS
+.Pp
 The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index 0d342cfe38d..69767f1dbf9 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: encrypt.1,v 1.12 1999/07/04 11:53:53 aaron Exp $
+.\"	$OpenBSD: encrypt.1,v 1.13 2000/03/05 00:28:52 aaron Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
 .\"
@@ -44,7 +44,7 @@ prints the encrypted form of
 to the standard output.  This is mostly useful for encrypting passwords
 from within scripts.
 .Pp
-The following options are supported:
+The options are as follows:
 .Bl -tag -width XxXXXXXXX
 .It Fl k
 Run in
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 5db67f12a6c..5bbedcf58a3 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.7 1999/07/04 11:53:54 aaron Exp $
+.\" $OpenBSD: fmt.1,v 1.8 2000/03/05 00:28:53 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,7 +70,7 @@ to 10 more than the goal length.  The spacing at the beginning of the
 input lines is preserved in the output, as are blank lines and
 interword spacing.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl c
 Center the text, line by line. In this case, most of the other
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 87f9f66b7e0..1bc1058ab7b 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: from.1,v 1.5 1999/07/04 11:53:54 aaron Exp $
+.\"	$OpenBSD: from.1,v 1.6 2000/03/05 00:28:57 aaron Exp $
 .\"	$NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -50,7 +50,7 @@
 prints
 out the mail header lines from the invoker's mailbox.
 .Pp
-The available options are as follows:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl f Ar file
 The supplied file
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index d0303092ab2..36286529846 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gprof.1,v 1.12 1999/07/04 11:53:54 aaron Exp $
+.\"	$OpenBSD: gprof.1,v 1.13 2000/03/05 00:28:53 aaron Exp $
 .\"	$NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -100,7 +100,7 @@ its descendents.
 .Pp
 Finally, an index of the function names is provided.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl a
 Suppresses the printing of statically declared functions.
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index e462a8fe590..a9a261a54f5 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -84,7 +84,8 @@ The default output field separator is a single space character.
 Many of the options use file and field numbers.
 Both file numbers and field numbers are 1 based, i.e., the first file on
 the command line is file number 1 and the first field is field number 1.
-The following options are available:
+.Pp
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl a Ar file_number
 In addition to the default output, produce a line for each unpairable
@@ -211,15 +212,15 @@ This has obvious difficulties in the presence of files named
 .Pp
 These options are available only so historic shell scripts don't require
 modification and should not be used.
-.Sh STANDARDS
-The
-.Nm
-command is expected to be
-.St -p1003.2
-compatible.
 .Sh SEE ALSO
 .Xr awk 1 ,
 .Xr comm 1 ,
 .Xr paste 1 ,
 .Xr sort 1 ,
 .Xr uniq 1
+.Sh STANDARDS
+The
+.Nm
+command is expected to be
+.St -p1003.2
+compatible.
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 3297695e5e0..ddc0ab81577 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.10 1999/07/03 02:11:08 aaron Exp $
+.\"	$OpenBSD: locate.1,v 1.11 2000/03/05 00:28:53 aaron Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.10 1999/07/03 02:11:08 aaron Exp $
+.\"	$Id: locate.1,v 1.11 2000/03/05 00:28:53 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -91,7 +91,7 @@ plain
 file names.  Characters less than 32 or greater than 127
 are stored as 2 bytes.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width 10n indent
 .It Fl S
 Print some statistics about the database and exit.
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index bd1140f3405..d7ccfdbe5d6 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.updatedb.8,v 1.8 1999/06/05 01:21:31 aaron Exp $
+.\"	$OpenBSD: locate.updatedb.8,v 1.9 2000/03/05 00:28:53 aaron Exp $
 .\"
 .\" Copyright (c) 1996
 .\"	Mike Pritchard <mpp@FreeBSD.org>.  All rights reserved.
@@ -54,9 +54,9 @@ script.
 The contents of the newly built database can be controlled by the
 .Pa /etc/locate.rc
 file as well as the command line arguments.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width -filesystems
-The available options are as follows:
 .It Fl -tmpdir
 Sets the directory temporary files are stored in.
 .It Fl -fcodes
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 7b452362828..83fde04d2fb 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.1,v 1.13 2000/02/07 01:38:11 millert Exp $
+.\"	$OpenBSD: mktemp.1,v 1.14 2000/03/05 00:28:57 aaron Exp $
 .\"
 .\" Copyright (c) 1996, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -84,9 +84,9 @@ subverted, it still allows a simple denial of service attack.  For these
 reasons it is suggested that
 .Nm
 be used instead.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
-The available options are as follows:
 .It Fl d
 Make a directory instead of a file.
 .It Fl q
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index f12be01d2b3..d3169698923 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgs.1,v 1.7 1999/06/10 22:38:03 pjanzen Exp $
+.\"	$OpenBSD: msgs.1,v 1.8 2000/03/05 00:28:58 aaron Exp $
 .\"	$NetBSD: msgs.1,v 1.5 1995/09/28 06:57:39 tls Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -54,21 +54,27 @@
 .Nm msgs
 is used to read system messages.
 These messages are
-sent by mailing to the login `msgs' and should be short
+sent by mailing to the login
+.Dq msgs
+and should be short
 pieces of information which are suitable to be read once by most users
 of the system.
 .Pp
-The options available are as follows:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl f
-Do not say ``No new messages.''
+Do not say
+.Dq \&No new messages.
 This is useful in a
 .Pa .login
 file since this is often the case here.
 .It Fl q
 Queries whether there are messages, printing
-``There are new messages.'' if there are.
-The command ``msgs \-q'' is often used in login scripts.
+.Dq There are new messages.
+if there are.
+The command
+.Ic msgs \-q
+is often used in login scripts.
 .It Fl h
 Print the first part of messages only.
 .It Fl r
@@ -138,14 +144,16 @@ the next time
 .Nm msgs
 will pick up where it last left off.
 .It Ic s
-Append the current message to the file ``Messages'' in the current directory;
+Append the current message to the file
+.Pa Messages
+in the current directory;
 `s\-' will save the previously displayed message. A `s' or `s\-' may
 be followed by a space and a file name to receive the message replacing
 the default ``Messages''.
 .It Ic m
 A copy of the specified message is placed in a temporary
 mailbox and
-.Xr mail  1
+.Xr mail 1
 is invoked on that mailbox.
 .It Ic p
 The specified message is piped through the program specified by the
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 9fedff1eea4..f9e4d118c74 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.16 1999/11/11 22:24:14 millert Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.17 2000/03/05 00:28:53 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -171,9 +171,8 @@ Specify a command to run instead of sending a signal to the process.
 The command must be enclosed in double quotes ('"').  You cannot specify
 both a command and a pid file.
 .El
-.Sh OPTIONS
-The following options can be used with
-.Nm newsyslog :
+.Pp
+The options are as follows:
 .Bl -tag -width XXX
 .It Fl f Ar config-file
 Instructs newsyslog to use
diff --git a/usr.bin/readlink/readlink.1 b/usr.bin/readlink/readlink.1
index 687b9c037eb..74021c8e5bb 100644
--- a/usr.bin/readlink/readlink.1
+++ b/usr.bin/readlink/readlink.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readlink.1,v 1.4 1998/09/27 16:57:50 aaron Exp $
+.\"	$OpenBSD: readlink.1,v 1.5 2000/03/05 00:28:53 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -53,7 +53,7 @@ on standard output.  If readlink is invoked with an argument other
 than the pathname of a symbolic link, it exits with a non-zero exit
 code without printing anything.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl f
 Canonicalize by following every symlink in every component of the given
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 5ffc3f4796b..4762e6b23ea 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rup.1,v 1.4 1999/06/05 01:21:38 aaron Exp $
+.\"	$OpenBSD: rup.1,v 1.5 2000/03/05 00:28:54 aaron Exp $
 .\" -*- nroff -*-
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
@@ -54,7 +54,7 @@ and the load averages.
 The load average numbers give the number of jobs in the run queue
 averaged over 1, 5 and 15 minutes.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl d
 For each host, report what its local time is.
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 1726bc9017e..182427f0d44 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rusers.1,v 1.4 1999/06/05 01:21:39 aaron Exp $
+.\"	$OpenBSD: rusers.1,v 1.5 2000/03/05 00:28:54 aaron Exp $
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -55,7 +55,7 @@ on is printed on each line. The
 command will wait for
 one minute to catch late responders.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Print all machines responding even if no one is currently logged in.
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 013b6631e1c..815ca59aa50 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.9 2000/03/04 22:19:26 aaron Exp $
+.\"	$OpenBSD: sed.1,v 1.10 2000/03/05 00:28:55 aaron Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -68,7 +68,7 @@ options.
 All commands are applied to the input in the order they are specified
 regardless of their origin.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 The files listed as parameters for the
diff --git a/usr.bin/skeyaudit/skeyaudit.1 b/usr.bin/skeyaudit/skeyaudit.1
index 85984d83abc..f87cee2562a 100644
--- a/usr.bin/skeyaudit/skeyaudit.1
+++ b/usr.bin/skeyaudit/skeyaudit.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skeyaudit.1,v 1.4 1999/06/05 01:21:40 aaron Exp $
+.\" $OpenBSD: skeyaudit.1,v 1.5 2000/03/05 00:28:58 aaron Exp $
 .\"
 .\"
 .Dd 22 July 1997
@@ -15,15 +15,15 @@
 .Sh DESCRIPTION
 .Nm
 searches through the file
-.Dq Pa /etc/skeykeys
+.Pa /etc/skeykeys
 for users whose S/Key sequence number is less than
 .Ar limit ,
 and mails them a reminder to run
 .Xr skeyinit 1
 soon.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width "-l limit" -indent
-The available options are as follows:
 .It Fl a
 Check all keys in
 .Pa /etc/skeykeys .
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1
index 95e0f139c11..b9e9c4849bf 100644
--- a/usr.bin/sort/sort.1
+++ b/usr.bin/sort/sort.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sort.1,v 1.6 2000/01/05 07:40:43 pjanzen Exp $
+.\"	$OpenBSD: sort.1,v 1.7 2000/03/05 00:28:55 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -66,7 +66,7 @@ lexicographically. By default, if keys are not given,
 .Nm sort
 regards each input line as a single field.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width file indent
 .It Fl c
 Check that the single input file is sorted.
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 4f25e11864f..e0a446abbd4 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tee.1,v 1.3 1998/10/30 00:24:38 aaron Exp $
+.\"	$OpenBSD: tee.1,v 1.4 2000/03/05 00:28:55 aaron Exp $
 .\"	$NetBSD: tee.1,v 1.4 1994/12/09 01:43:37 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -49,12 +49,12 @@
 .Op Ar file ...
 .Sh DESCRIPTION
 The
-.Nm tee
+.Nm
 utility copies standard input to standard output,
 making a copy in zero or more files.
 The output is unbuffered.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 Append the output to the files rather than
@@ -73,18 +73,18 @@ A pathname of an output
 .El
 .Pp
 The
-.Nm tee
+.Nm
 utility takes the default action for all signals,
 except in the event of the
 .Fl i
 option.
 .Pp
 The
-.Nm tee
+.Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
-.Nm tee
+.Nm
 function is expected to be
 .Tn POSIX
 .St -p1003.2
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index c926fa7c964..2075c75985d 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tn3270.1,v 1.6 1999/06/05 01:21:44 aaron Exp $
+.\"	$OpenBSD: tn3270.1,v 1.7 2000/03/05 00:28:58 aaron Exp $
 .\" Copyright (c) 1986, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -75,9 +75,7 @@ user interface (see
 which will, in certain circumstances, interpret and generate
 raw 3270 control streams.
 .Pp
-The flags to
-.Nm tn3270
-are as follows:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl d
 Turn on socket-level tracing (for super-user only).
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index d95d3e75b6a..e7f82621586 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: touch.1,v 1.3 1998/10/30 00:24:40 aaron Exp $
+.\"	$OpenBSD: touch.1,v 1.4 2000/03/05 00:28:55 aaron Exp $
 .\"	$NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -56,7 +56,7 @@ utility sets the modification and access times of files to the
 current time of day.
 If the file doesn't exist, it is created with default permissions.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 Change the access time of the file.
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 814620fdb5b..13b66a6c5ea 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.4 1999/04/30 06:24:25 pjanzen Exp $
+.\"	$OpenBSD: tr.1,v 1.5 2000/03/05 00:28:55 aaron Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -65,7 +65,7 @@ The
 utility copies the standard input to the standard output with substitution
 or deletion of selected characters.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
 Complements the set of characters in
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 4eead962602..96235c4db3b 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ul.1,v 1.4 1999/06/05 01:21:45 aaron Exp $
+.\"	$OpenBSD: ul.1,v 1.5 2000/03/05 00:28:55 aaron Exp $
 .\"	$NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -46,7 +46,7 @@
 .Op Fl t Ar terminal
 .Op Ar name Ar ...
 .Sh DESCRIPTION
-.Nm ul
+.Nm
 reads the named files (or standard input if none are given)
 and translates occurrences of underscores to the sequence
 which indicates underlining for the terminal in use, as specified
@@ -59,12 +59,12 @@ If the terminal is incapable of underlining, but is capable of
 a standout mode, then that is used instead.
 If the terminal can overstrike,
 or handles underlining automatically,
-.Nm ul
+.Nm
 degenerates to
 .Xr cat 1 .
 If the terminal cannot underline, underlining is ignored.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl i
 Underlining is indicated by a separate line containing appropriate
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 2101ece0a06..c31d99d6c71 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uname.1,v 1.5 1999/06/05 01:21:45 aaron Exp $
+.\"	$OpenBSD: uname.1,v 1.6 2000/03/05 00:28:55 aaron Exp $
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -47,7 +47,7 @@ The
 utility writes symbols representing one or more system characteristics
 to the standard output.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Behave as though all of the options
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index f46e9eb0dab..a9a0bd367bc 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uniq.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\"	$OpenBSD: uniq.1,v 1.4 2000/03/05 00:28:56 aaron Exp $
 .\"	$NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -62,7 +62,7 @@ not written.
 Repeated lines in the input will not be detected if they are not adjacent,
 so it may be necessary to sort the files first.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
 Precede each output line with the count of the number of times the line
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index e64c7abf4d1..7da425e1678 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.6 1999/10/17 19:59:47 aaron Exp $
+.\"	$OpenBSD: wc.1,v 1.7 2000/03/05 00:28:56 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,7 @@ space.  White space characters are the set of characters for which the
 .Xr isspace 3
 function returns true.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
 The number of bytes in each input file
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index f301af343d0..31977fdfdb7 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.8 1999/10/05 21:13:43 aaron Exp $
+.\"	$OpenBSD: yacc.1,v 1.9 2000/03/05 00:28:56 aaron Exp $
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -65,7 +65,7 @@ written in the C programming language.
 normally writes the parse tables and the driver routine to the file
 .Pa y.tab.c .
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ar
 .It Fl b Ar prefix
 The
diff --git a/usr.sbin/afs/afsd/afsd.8 b/usr.sbin/afs/afsd/afsd.8
index e5d9b02c678..df8b8c35f81 100644
--- a/usr.sbin/afs/afsd/afsd.8
+++ b/usr.sbin/afs/afsd/afsd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: afsd.8,v 1.6 1999/10/11 21:12:20 aaron Exp $
+.\"	$OpenBSD: afsd.8,v 1.7 2000/03/05 00:28:57 aaron Exp $
 .\"
 .Dd September  5, 1998
 .Dt AFSD 8
@@ -43,7 +43,7 @@ automatically started when
 .Xr mount_xfs 8
 is run.
 .Pp
-Available options are as follows:
+The options are as follows:
 .Bl -tag -width Ds
 .It Xo
 .Fl t Ns ,
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 934c41efbe4..e4ea299d0d5 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: apm.8,v 1.8 1999/06/05 22:16:27 aaron Exp $
+.\"	$Id: apm.8,v 1.9 2000/03/05 00:28:57 aaron Exp $
 .\"
 .Dd March 18, 1996
 .Dt APM 8
@@ -58,8 +58,7 @@ With no flags,
 .Nm
 displays the current power management state in verbose form.
 .Pp
-Available options are as follows:
-.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl z
 Put the system into suspend (deep sleep) mode.
diff --git a/usr.sbin/ipftest/ipftest.1 b/usr.sbin/ipftest/ipftest.1
index 8a55686242e..ba3fc96dd31 100644
--- a/usr.sbin/ipftest/ipftest.1
+++ b/usr.sbin/ipftest/ipftest.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipftest.1,v 1.12 1999/11/13 19:48:31 ericj Exp $
+.\"     $OpenBSD: ipftest.1,v 1.13 2000/03/05 00:28:51 aaron Exp $
 .Dd May 23, 1999
 .Dt IPFTEST 1
 .Os
@@ -70,7 +70,7 @@ in on le0 localhost 10.4.12.1
 out on le0 tcp 10.4.12.1,2245 10.1.1.1,23 S
 .Ed
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl v
 Verbose mode.  This provides more information about which parts of rule
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 306ece1b4b8..9096739b925 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -59,7 +59,7 @@ unless
 .Ar system
 is specified.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl T
 Prints the number of used and free slots for open files, used vnodes, and swap
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 721caf05273..1b843ac850e 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sa.8,v 1.7 1999/10/07 22:13:34 aaron Exp $
+.\"	$OpenBSD: sa.8,v 1.8 2000/03/05 00:28:57 aaron Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: sa.8,v 1.7 1999/10/07 22:13:34 aaron Exp $
+.\"	$Id: sa.8,v 1.8 2000/03/05 00:28:57 aaron Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -97,9 +97,7 @@ Total number of I/O operations.
 User time, in minutes.
 .El
 .Pp
-The options to
-.Nm
-are as follows:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 List all command names, including those containing unprintable
diff --git a/usr.sbin/sesd/sesd/sesd.8 b/usr.sbin/sesd/sesd/sesd.8
index 56d5bd4b872..110b25e964e 100644
--- a/usr.sbin/sesd/sesd/sesd.8
+++ b/usr.sbin/sesd/sesd/sesd.8
@@ -1,5 +1,5 @@
 .\"	$NetBSD: $
-.\"	$OpenBSD: sesd.8,v 1.1 2000/02/21 08:45:15 mjacob Exp $
+.\"	$OpenBSD: sesd.8,v 1.2 2000/03/05 00:28:51 aaron Exp $
 .\"	$FreeBSD: $
 .\"
 .\" Copyright (c) 2000 Matthew Jacob
@@ -56,7 +56,7 @@ When no other options are supplied,
 detached becomes a daemon, by default waking up every 30 seconds to
 poll each device for a change in state.
 .Pp
-The following options may be used:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl p Ar poll-interval
 Change the interval of polling from the default 30 seconds to the number
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 20fdbc4e02b..b325354e1ae 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.9 1999/06/05 22:18:19 aaron Exp $
+.\"	$OpenBSD: trpt.8,v 1.10 2000/03/05 00:28:51 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,8 +67,8 @@ grouped according to
 connection protocol control
 block
 .Pq Tn PCB .
-The following options may be used to
-alter this behavior.
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 In addition to the normal output,
@@ -89,7 +89,7 @@ In addition to the normal output,
 print a detailed description of the packet
 sequencing information.
 .It Fl t
-in addition to the normal output,
+In addition to the normal output,
 print the values for all timers at each
 point in the trace.
 .It Fl M Ar core
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index d4615d4518e..2f774d6b171 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trsp.8,v 1.8 1999/06/05 22:18:20 aaron Exp $
+.\"	$OpenBSD: trsp.8,v 1.9 2000/03/05 00:28:51 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,8 +67,8 @@ grouped according to
 connection protocol control
 block
 .Pq Tn PCB .
-The following options may be used to
-alter this behavior.
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 In addition to the normal output,
-- 
2.20.1