- Get rid of ".Sh OPTIONS" and always use the standard options list intro.

- Move some BUGS/CAVEATS to the end of the man pages where they should go.
- Correct some .Nm usage.

22 files changed, 236 insertions, 228 deletions

diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index fb7f4932989..6ea227b9880 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.21 2000/10/18 06:55:09 aaron Exp $
+.\"	$OpenBSD: pax.1,v 1.22 2000/11/08 19:37:32 aaron Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -286,7 +286,7 @@ will attempt to recover from media defects and will search through the archive
 to locate and process the largest number of archive members possible (see the
 .Fl E
 option for more details on error handling).
-.Sh OPERANDS
+.Pp
 The
 .Ar directory
 operand specifies a destination directory pathname.
@@ -330,7 +330,7 @@ will write these
 .Ar file
 operand pathnames in a diagnostic message to standard error
 and then exit with a non-zero exit status.
-.Sh OPTIONS
+.Pp
 The options are as follows:
 .Bl -tag -width 4n
 .It Fl r
diff --git a/libexec/identd/identd.8 b/libexec/identd/identd.8
index b9e1ef6b5e9..e9e7c3c926a 100644
--- a/libexec/identd/identd.8
+++ b/libexec/identd/identd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: identd.8,v 1.15 2000/10/30 17:45:59 aaron Exp $
+.\"	$OpenBSD: identd.8,v 1.16 2000/11/08 19:37:37 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -65,7 +65,8 @@ operates by looking up specific
 .Tn TCP/IP
 connections and returning the user name of the
 process owning the connection.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl i
 Tells
diff --git a/libexec/tcpd/tcpdmatch/tcpdmatch.8 b/libexec/tcpd/tcpdmatch/tcpdmatch.8
index 1b33ebb052e..665891899f7 100644
--- a/libexec/tcpd/tcpdmatch/tcpdmatch.8
+++ b/libexec/tcpd/tcpdmatch/tcpdmatch.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdmatch.8,v 1.6 2000/10/30 17:46:27 aaron Exp $
+.\"	$OpenBSD: tcpdmatch.8,v 1.7 2000/11/08 19:37:38 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -71,7 +71,23 @@ In addition, it displays the optional
 shell commands or options in a pretty-printed format; this makes it
 easier for you to spot any discrepancies between what you want and what
 the program understands.
-.Sh ARGUMENTS
+.Pp
+The options are as follows:
+.Bl -tag -width XXXXXXXXXXXX
+.It Fl d
+Examine
+.Pa hosts.allow
+and
+.Pa hosts.deny
+files in the current directory instead of the default ones.
+.It Fl i Ar inet_conf
+Specify this option when
+.Nm
+is unable to find your
+.Pa inetd.conf
+network configuration file, or when you wish to test with a non-default one.
+.El
+.Pp
 The following two arguments are always required:
 .Pp
 .Bl -tag -width XXXXXX -compact
@@ -122,21 +138,6 @@ Typically, a login name or a numeric user ID.
 The default user name is
 .Dq unknown .
 .El
-.Sh OPTIONS
-.Bl -tag -width XXXXXXXXXXXX
-.It Fl d
-Examine
-.Pa hosts.allow
-and
-.Pa hosts.deny
-files in the current directory instead of the default ones.
-.It Fl i Ar inet_conf
-Specify this option when
-.Nm
-is unable to find your
-.Pa inetd.conf
-network configuration file, or when you wish to test with a non-default one.
-.El
 .Sh EXAMPLES
 To predict how
 .Xr tcpd 8
@@ -170,9 +171,9 @@ access control tables are:
 .Pp
 .Bl -tag -width /etc/hosts.allow -compact
 .It Pa /etc/hosts.allow
-Access control table (allow list)
+access control table (allow list)
 .It Pa /etc/hosts.deny
-Access control table (deny list)
+access control table (deny list)
 .El
 .Sh SEE ALSO
 .Xr hosts_access 5 ,
diff --git a/sbin/wicontrol/wicontrol.8 b/sbin/wicontrol/wicontrol.8
index 01ee9a8ab9f..3b3093121ec 100644
--- a/sbin/wicontrol/wicontrol.8
+++ b/sbin/wicontrol/wicontrol.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wicontrol.8,v 1.15 2000/10/06 22:13:11 niklas Exp $
+.\"	$OpenBSD: wicontrol.8,v 1.16 2000/11/08 19:37:33 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu> All rights reserved.
@@ -85,7 +85,7 @@ The
 .Nm
 command given without any additional flags retrieves the current card
 settings from the driver and prints them out.
-.Sh OPTIONS
+.Pp
 The options are as follows:
 .Pp
 .Bl -tag -width Fl
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index c7fd249906a..a667a76b63c 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pr.1,v 1.11 2000/03/10 20:17:49 aaron Exp $
+.\"	$OpenBSD: pr.1,v 1.12 2000/11/08 19:37:33 aaron Exp $
 .\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 1993
@@ -135,7 +135,7 @@ If standard output is associated with a terminal,
 diagnostic messages are suppressed until the
 .Nm pr
 utility has completed processing.
-.Sh OPTIONS
+.Pp
 In the following option descriptions,
 .Em column ,
 .Em lines ,
@@ -146,6 +146,8 @@ and
 are positive decimal integers and
 .Em gap
 is a non-negative decimal integer.
+.Pp
+The options are as follows:
 .Bl -tag -width 4n
 .It Ar \&+page
 Begin output at page number
@@ -403,25 +405,6 @@ or
 .Em <return>
 characters, and except in the case of unmodified single-column output,
 use of these characters will cause formatting errors.
-.Sh BUGS
-The lack of a line wrapping option, and the specification that truncation
-does not apply to single-column output frequently results in formatting
-errors when input lines are longer than actual line width of the output device.
-.Pp
-The default width of 72 is archaic and non-obvious since it is normally
-ignored in the default single column mode.
-Using the
-.Fl m
-option with one column provides a way to truncate single column output but
-there's no way to wrap long times to a fixed line width.
-.Pp
-The default of
-.Em <tab>
-for the separator for the
-.Fl n
-and
-.Fl s
-options often results in lines apparently wider than expected.
 .Sh SEE ALSO
 .Xr cat 1 ,
 .Xr more 1 ,
@@ -441,3 +424,22 @@ A
 .Nm
 command appeared in
 .At v1 .
+.Sh BUGS
+The lack of a line wrapping option, and the specification that truncation
+does not apply to single-column output frequently results in formatting
+errors when input lines are longer than actual line width of the output device.
+.Pp
+The default width of 72 is archaic and non-obvious since it is normally
+ignored in the default single column mode.
+Using the
+.Fl m
+option with one column provides a way to truncate single column output but
+there's no way to wrap long times to a fixed line width.
+.Pp
+The default of
+.Em <tab>
+for the separator for the
+.Fl n
+and
+.Fl s
+options often results in lines apparently wider than expected.
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 318f4502106..84fd72627e3 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -34,7 +34,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: ssh.1,v 1.64 2000/10/16 21:46:31 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.65 2000/11/08 19:37:33 aaron Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -352,7 +352,8 @@ The
 .Cm StrictHostKeyChecking
 option (see below) can be used to prevent logins to machines whose
 host key is not known or has changed.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 Disables forwarding of the authentication agent connection.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 0ba94fd2e6e..bed97742f4a 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.18 2000/05/15 06:55:44 deraadt Exp $
+.\"	$OpenBSD: adduser.8,v 1.19 2000/11/08 19:37:33 aaron Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -72,6 +72,86 @@ program removes users from the system.
 When not passed any arguments, both
 utilities operate in interactive mode and prompt for any required information.
 .Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Xo Fl batch Ar username
+.Oo Ar group Ns Op , Ns Ar group
+.Ar ... Oc
+.Op Ar fullname
+.Op Ar password
+.Xc
+Enter batch mode in which multiple users are specified on the command-line
+in a compact format.
+By default the password is assumed to already be properly encrypted.
+.It Fl check_only
+Check the passwd, group, and shells databases for consistency and problems
+then exit without performing any other operation.
+.It Fl config_create
+Create or edit default configuration information and message file before
+proceeding with the normal interactive adduser procedure.
+.It Fl dotdir Ar directory
+Copy files from
+.Ar directory
+into the HOME directory of new users.
+Files named in the fashion of
+.Dq Pa dot.foo
+will be renamed to
+.Dq Pa .foo .
+By default, all files are made writable and readable by
+their owner.
+.\" don't allow group or world to write files and allow only owner
+.\" to read/execute/write .rhost, .Xauthority, .kermrc, .netrc, Mail,
+.\" prv, iscreen, term.
+.It Fl encrypt Ns No , Fl e Ar method
+Encrypt local passwords using
+.Ar method
+of encryption as described in
+.Xr passwd.conf 5 .
+.It Fl group Ar login_group
+Specify the default login group.
+A value of
+.Ar USER
+means that the username is to be used as the login group.
+.It Xo
+.Fl help Ns No ,
+.Fl h Ns No , Fl ?
+.Xc
+Print a summary of options and exit.
+.It Fl home Ar partition
+Specify the default home partition where all users' home directories
+are to be located.
+.It Fl message Ar file
+Send new users a welcome message from
+.Ar file .
+Specifying a value of
+.Dq no
+for
+.Ar file
+causes no message to be sent to new users.
+.It Fl noconfig
+Do not read the default configuration file.
+.It Fl shell Ar shell
+Specify the default shell for new users.
+.It Xo
+.Fl silent Ns No , Fl s Ns No ,
+.Fl quiet Ns No , Fl q
+.Xc
+Causes the program to print fewer warnings, questions, and bug reports.
+.It Fl uid Ar uid
+Use UIDs from
+.Ar uid
+up when automatically generating UIDs.
+.It Fl unencrypted
+Causes the program to assume that the password given in batch mode is
+unencrypted.
+The password will be encrypted before it's added to the password file.
+Use of this option will leave username and cleartext password displayable
+for any user.
+.It Fl verbose Ns No , Fl v
+Causes the program to print many warnings and questions.
+This option is recommended for novice users.
+.El
+.Pp
 .Nm adduser
 first performs consistency checks on the password, group, and shell databases.
 This includes finding any duplicate user or group names, illegal shells, or
@@ -209,85 +289,6 @@ Parse command-line options.
 The
 .Xr adduser.conf 5
 format is explained within that file and is quite straightforward.
-.Sh OPTIONS
-.Bl -tag -width Ds
-.It Xo Fl batch Ar username
-.Oo Ar group Ns Op , Ns Ar group
-.Ar ... Oc
-.Op Ar fullname
-.Op Ar password
-.Xc
-Enter batch mode in which multiple users are specified on the command-line
-in a compact format.
-By default the password is assumed to already be properly encrypted.
-.It Fl check_only
-Check the passwd, group, and shells databases for consistency and problems
-then exit without performing any other operation.
-.It Fl config_create
-Create or edit default configuration information and message file before
-proceeding with the normal interactive adduser procedure.
-.It Fl dotdir Ar directory
-Copy files from
-.Ar directory
-into the HOME directory of new users.
-Files named in the fashion of
-.Dq Pa dot.foo
-will be renamed to
-.Dq Pa .foo .
-By default, all files are made writable and readable by
-their owner.
-.\" don't allow group or world to write files and allow only owner
-.\" to read/execute/write .rhost, .Xauthority, .kermrc, .netrc, Mail,
-.\" prv, iscreen, term.
-.It Fl encrypt Ns No , Fl e Ar method
-Encrypt local passwords using
-.Ar method
-of encryption as described in
-.Xr passwd.conf 5 .
-.It Fl group Ar login_group
-Specify the default login group.
-A value of
-.Ar USER
-means that the username is to be used as the login group.
-.It Xo
-.Fl help Ns No ,
-.Fl h Ns No , Fl ?
-.Xc
-Print a summary of options and exit.
-.It Fl home Ar partition
-Specify the default home partition where all users' home directories
-are to be located.
-.It Fl message Ar file
-Send new users a welcome message from
-.Ar file .
-Specifying a value of
-.Dq no
-for
-.Ar file
-causes no message to be sent to new users.
-.It Fl noconfig
-Do not read the default configuration file.
-.It Fl shell Ar shell
-Specify the default shell for new users.
-.It Xo
-.Fl silent Ns No , Fl s Ns No ,
-.Fl quiet Ns No , Fl q
-.Xc
-Causes the program to print fewer warnings, questions, and bug reports.
-.It Fl uid Ar uid
-Use UIDs from
-.Ar uid
-up when automatically generating UIDs.
-.It Fl unencrypted
-Causes the program to assume that the password given in batch mode is
-unencrypted.
-The password will be encrypted before it's added to the password file.
-Use of this option will leave username and cleartext password displayable
-for any user.
-.It Fl verbose Ns No , Fl v
-Causes the program to print many warnings and questions.
-This option is recommended for novice users.
-.El
 .\" .Sh FORMAT
 .\" .Bl -tag -width Ds -compact
 .\" .Ql Pa #
@@ -374,4 +375,3 @@ log file for
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8 ,
 .Xr yp 8
-
diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8
index b00f84dda76..75d4d76e613 100644
--- a/usr.sbin/amd/amd/amd.8
+++ b/usr.sbin/amd/amd/amd.8
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)amd.8	5.10 (Berkeley) 4/19/94
-.\"	$Id: amd.8,v 1.8 2000/03/19 17:57:00 aaron Exp $
+.\"	$Id: amd.8,v 1.9 2000/11/08 19:37:34 aaron Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -90,7 +90,8 @@ which uses the map defined by
 to determine how to resolve the lookup.
 Generally, this will be a host name, some filesystem information
 and some mount options for the given filesystem.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a Ar temporary-directory
 Specify an alternative location for the real mount points.
diff --git a/usr.sbin/amd/amq/amq.8 b/usr.sbin/amd/amq/amq.8
index ac779318d85..1e7e6bafc23 100644
--- a/usr.sbin/amd/amq/amq.8
+++ b/usr.sbin/amd/amq/amq.8
@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)amq.8	8.3 (Berkeley) 4/18/94
-.\"	$Id: amq.8,v 1.5 2000/03/19 17:57:01 aaron Exp $
+.\"	$Id: amq.8,v 1.6 2000/11/08 19:37:34 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
@@ -71,7 +71,8 @@ option.
 .Pp
 If directory names are given, as output by default,
 then per-filesystem information is displayed.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl f
 Request automounter to flush the internal caches.
@@ -113,15 +114,6 @@ option.
 .Tn RPC
 protocol description
 .El
-.Sh CAVEATS
-.Nm amq
-uses a Sun registered
-.Tn RPC
-program number (300019 decimal) which may not
-be in the
-.Pa /etc/rpc
-database.
-.El
 .Sh SEE ALSO
 .Xr amd 8
 .Sh AUTHOR
@@ -130,3 +122,11 @@ database.
 .\" .Sh HISTORY
 .\" .Nm amq
 .\" .At
+.Sh CAVEATS
+.Nm amq
+uses a Sun registered
+.Tn RPC
+program number (300019 decimal) which may not
+be in the
+.Pa /etc/rpc
+database.
diff --git a/usr.sbin/bootpd/bootptest.8 b/usr.sbin/bootpd/bootptest.8
index cc93aa52428..01703541675 100644
--- a/usr.sbin/bootpd/bootptest.8
+++ b/usr.sbin/bootpd/bootptest.8
@@ -21,7 +21,8 @@ or until ten requests have gone unanswered.
 After a response is received,
 .Nm
 will wait one more second listening for additional responses.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width "-m magic_number"
 .It Fl f Ar bootfile
 Fill in the boot file field of the request with
diff --git a/usr.sbin/ipsend/ipresend/ipresend.1 b/usr.sbin/ipsend/ipresend/ipresend.1
index e153ea856e6..00821f00fe2 100644
--- a/usr.sbin/ipsend/ipresend/ipresend.1
+++ b/usr.sbin/ipsend/ipresend/ipresend.1
@@ -1,4 +1,4 @@
-./" $OpenBSD: ipresend.1,v 1.8 2000/08/23 03:13:33 ericj Exp $
+./" $OpenBSD: ipresend.1,v 1.9 2000/11/08 19:37:34 aaron Exp $
 .Dd October 9, 1999
 .Dt IPRESEND 1
 .Os
@@ -24,7 +24,8 @@ binary data.
 .Pp
 .Nm
 must be run as root.
-.Ss OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width "d interface "
 .It Fl d Ar interface
 Set the interface name to be the name supplied.
diff --git a/usr.sbin/ipsend/ipsend/ipsend.1 b/usr.sbin/ipsend/ipsend/ipsend.1
index 949abe51667..550d0318031 100644
--- a/usr.sbin/ipsend/ipsend/ipsend.1
+++ b/usr.sbin/ipsend/ipsend/ipsend.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipsend.1,v 1.6 2000/08/23 03:19:39 ericj Exp $
+.\"     $OpenBSD: ipsend.1,v 1.7 2000/11/08 19:37:35 aaron Exp $
 .Dd August 22, 2000
 .Dt IPSEND 1
 \!\" Originally by Darren Reed <darrenr@cyber.com.au>
@@ -32,7 +32,6 @@ a combination of A, S, F, U, P and R, last.
 The other way it may be compiled, with DOSOCKET defined, is to allow an
 attempt at making a TCP connection using a with ipsend resending the SYN
 packet as per the command line options.
-.Sh OPTIONS
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index 5a0ac91e2f3..184c3f98ad8 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.8 2000/04/15 11:46:00 aaron Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.9 2000/11/08 19:37:35 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -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: mopa.out.1,v 1.8 2000/04/15 11:46:00 aaron Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.9 2000/11/08 19:37:35 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
@@ -40,7 +40,7 @@
 .Ar infile
 .Ar outfile
 .Sh DESCRIPTION
-.Nm mopa.out
+.Nm
 is used to convert an a.out file to a MOP-image.
 .Pp
 This program will check if
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index 7f80b4012ac..baaa5b3fa9b 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.6 1999/07/07 10:50:13 aaron Exp $
+.\"	$OpenBSD: mopchk.1,v 1.7 2000/11/08 19:37:35 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -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: mopchk.1,v 1.6 1999/07/07 10:50:13 aaron Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.7 2000/11/08 19:37:35 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
@@ -49,15 +49,14 @@ If
 .Ar filename
 is given, information about the MOP-image is read from the header of the
 file.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Show all the Ethernets attached to the system.
 .It Fl v
 Show version of mopprobe.
 .El
-.Sh BUGS
-In some implementations the same interface can occur more than once.
 .Sh SEE ALSO
 .Xr mopa.out 1 ,
 .Xr mopprobe 1 ,
@@ -65,3 +64,5 @@ In some implementations the same interface can occur more than once.
 .Xr mopd 8
 .Sh AUTHORS
 Mats O Jansson (moj@stacken.kth.se).
+.Sh BUGS
+In some implementations the same interface can occur more than once.
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index 0219fc944f0..e93da985947 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.8 2000/03/19 17:57:08 aaron Exp $
+.\"	$OpenBSD: mopd.8,v 1.9 2000/11/08 19:37:36 aaron Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -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: mopd.8,v 1.8 2000/03/19 17:57:08 aaron Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.9 2000/11/08 19:37:36 aaron Exp $
 .\"
 .Dd September 24, 1995
 .Dt MOPD 8
@@ -40,22 +40,22 @@
 .Op Fl adf
 .Op Ar interface
 .Sh DESCRIPTION
-.Nm mopd
+.Nm
 services MOP Load requests on the Ethernet connected to
 .Ar interface
 or all interfaces if
 .Fl a
 is given.
 In a load request received by
-.Nm mopd
+.Nm
 a filename can be given.
 This is the normal case for, e.g., terminal servers.
 If a filename isn't given
-.Nm mopd
+.Nm
 must know what image to load.
 .Pp
 Upon receiving a request,
-.Nm mopd
+.Nm
 checks if the requested file exists in
 .Pa /tftpboot/mop .
 The filename is normally all uppercase and with an extension of
@@ -65,7 +65,7 @@ filename (e.g.,
 .Pa 08002b09f4de.SYS ) ,
 and it might be a soft link to another file.
 .Pp
-.Nm mopd
+.Nm
 supports two kinds of files.
 The file is first checked to see if it is in
 .Xr a.out 5
@@ -73,7 +73,7 @@ format.
 If not, a few of Digital's formats are checked.
 .Pp
 In normal operation,
-.Nm mopd
+.Nm
 forks a copy of itself and runs in
 the background.
 Anomalies and errors are reported via
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 28c7fa51efa..2f202c33b67 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.8 2000/03/19 17:57:08 aaron Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.9 2000/11/08 19:37:36 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -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: mopprobe.1,v 1.8 2000/03/19 17:57:08 aaron Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.9 2000/11/08 19:37:36 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
@@ -48,7 +48,7 @@
 .Op Fl v
 .Ar interface
 .Sh DESCRIPTION
-.Nm mopprobe
+.Nm
 prints the Ethernet address and nodename of DECserver 100/200/250/300 on the
 Ethernet connected to
 .Ar interface
@@ -63,7 +63,8 @@ inhibits all messages but the first from a node.
 With
 .Sq Fl v
 all MOP/RC SID messages will be shown (e.g., machines running DECnet).
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index 0d8d6c03255..25a2fceb49d 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.5 1999/07/07 10:50:12 aaron Exp $
+.\"	$OpenBSD: moptrace.1,v 1.6 2000/11/08 19:37:36 aaron Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -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: moptrace.1,v 1.5 1999/07/07 10:50:12 aaron Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.6 2000/11/08 19:37:36 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
@@ -46,13 +46,14 @@
 .Op Fl 3 | 4
 .Op Ar interface
 .Sh DESCRIPTION
-.Nm moptrace
+.Nm
 prints the contents of MOP packages on the Ethernet connected to
 .Ar interface
 or all known interfaces if
 .Fl a
 is given.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Listen on all the Ethernets attached to the system.
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index dc7f7d895f2..1747aa304ad 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.16 2000/10/23 22:23:34 espie Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.17 2000/11/08 19:37:36 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -62,8 +62,8 @@ It is more expected that you will use a front-end tool for
 the job rather than muddling through it yourself.
 Nonetheless, a short
 description of the input syntax is included in this document.
-.Sh OPTIONS
-The following command line options are supported:
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl f Ar packinglist
 Fetch
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index ea1ee68c799..6c49529425a 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.10 2000/04/15 02:15:19 aaron Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.11 2000/11/08 19:37:36 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -43,35 +43,8 @@ Package names may be specified either as the package name itself, or as filename
 , or the
 .Dq .tar
 suffix.
-.Sh WARNING
-.Bf -emphasis
-Since the
-.Nm
-command may execute scripts or programs provided by a package file,
-your system may be susceptible to ``trojan horses'' or other subtle
-attacks from miscreants who create dangerous package files.
 .Pp
-You are advised to verify the competence and identity of those who
-provide installable package files.
-For extra protection, examine all
-the package control files in the package record directory
-.Pq Pa /var/db/pkg/<pkg-name>/ .
-Pay particular
-attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
-and inspect the +CONTENTS file for
-.Cm @cwd ,
-.Cm @mode
-(check for setuid),
-.Cm @dirrm ,
-.Cm @exec ,
-and
-.Cm @unexec
-directives, and/or use the
-.Xr pkg_info 1
-command to examine the installed package control files.
-.Ef
-.Sh OPTIONS
-The following command line options are supported:
+The options are as follows:
 .Bl -tag -width indent
 .It Ar pkg-name Op Ar ...
 The named packages are deinstalled.
@@ -187,5 +160,30 @@ most of the work
 .It "John Kohl"
 refined it for NetBSD
 .El
-.Sh BUGS
-Sure to be some.
+.Sh WARNING
+.Bf -emphasis
+Since the
+.Nm
+command may execute scripts or programs provided by a package file,
+your system may be susceptible to ``trojan horses'' or other subtle
+attacks from miscreants who create dangerous package files.
+.Pp
+You are advised to verify the competence and identity of those who
+provide installable package files.
+For extra protection, examine all
+the package control files in the package record directory
+.Pq Pa /var/db/pkg/<pkg-name>/ .
+Pay particular
+attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
+and inspect the +CONTENTS file for
+.Cm @cwd ,
+.Cm @mode
+(check for setuid),
+.Cm @dirrm ,
+.Cm @exec ,
+and
+.Cm @unexec
+directives, and/or use the
+.Xr pkg_info 1
+command to examine the installed package control files.
+.Ef
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index 6351818adc2..ecfd27d5ec5 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtsold.8,v 1.11 2000/08/13 18:24:00 itojun Exp $
+.\"	$OpenBSD: rtsold.8,v 1.12 2000/11/08 19:37:37 aaron Exp $
 .\"	$KAME: rtsold.8,v 1.14 2000/08/13 18:06:39 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -131,7 +131,8 @@ Upon receipt of signal
 will dump the current internal state into
 .Pa /var/run/rtsold.dump .
 .\"
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Autoprobe outgoing interface.
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index 48fde67523f..1de74280cd7 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.23 2000/04/27 10:07:59 itojun Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.24 2000/11/08 19:37:37 aaron Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -43,7 +43,8 @@ that match the boolean
 .Ar expression .
 You must have read access to
 .Pa /dev/bpf\&* .
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width "-ddd"
 .It Fl a
 Attempt to convert network and broadcast addresses to names.
diff --git a/usr.sbin/ypserv/revnetgroup/revnetgroup.8 b/usr.sbin/ypserv/revnetgroup/revnetgroup.8
index 799014fa2f1..e2068f2d42a 100644
--- a/usr.sbin/ypserv/revnetgroup/revnetgroup.8
+++ b/usr.sbin/ypserv/revnetgroup/revnetgroup.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: revnetgroup.8,v 1.5 2000/03/19 17:57:18 aaron Exp $
+.\"	$OpenBSD: revnetgroup.8,v 1.6 2000/11/08 19:37:37 aaron Exp $
 .\"
 .\" Copyright (c) 1995
 .\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -44,7 +44,7 @@
 .Fl h
 .Op Fl f Ar netgroup_file
 .Sh DESCRIPTION
-.Nm revnetgroup
+.Nm
 processes the contents of a file in
 .Xr netgroup 5
 format into what is called
@@ -55,9 +55,9 @@ netgroup memberships in terms of which members reside in a particular
 group, the reverse netgroup format specifies what groups are associated
 with a particular member.
 This information is used to generate the
-.Nm netgroup.byuser
+.Pa netgroup.byuser
 and
-.Nm netgroup.byhosts
+.Pa netgroup.byhosts
 YP maps.
 These reverse netgroup maps are used to help speed up
 netgroup lookups, particularly for the
@@ -65,14 +65,14 @@ netgroup lookups, particularly for the
 library function.
 .Pp
 For example, the standard
-.Nm /etc/netgroup
+.Pa /etc/netgroup
 file may list a netgroup and a list of its members.
 Here, the netgroup is considered the
 .Pa key
 and the member names are the
 .Pa data .
 By contrast, the reverse
-.Nm netgroup.byusers
+.Pa netgroup.byusers
 database lists each unique
 member as the key and the netgroups to which the members belong become
 the data.
@@ -90,15 +90,13 @@ of users and hosts, since it can take a considerable amount of time
 to process very large netgroup databases.
 .Pp
 The
-.Nm revnetgroup
+.Nm
 command prints its results on the standard output.
 It is usually called only by
-.Nm /var/yp/\<domain\>/Makefile
+.Pa /var/yp/\<domain\>/Makefile
 when rebuilding the YP netgroup maps.
-.Sh OPTIONS
-The
-.Nm revnetgroup
-command supports the following options:
+.Pp
+The options are as follows:
 .Bl -tag -width flag
 .It Fl u
 Generate netgroup.byuser output; only username information in the
@@ -112,9 +110,9 @@ or
 flags must be specified.)
 .It Op Fl f Ar netgroup_file
 The
-.Nm revnetgroup
+.Nm
 command uses
-.Nm /etc/netgroup
+.Pa /etc/netgroup
 as its default input file.
 The
 .Fl f
@@ -122,16 +120,16 @@ flag allows the user to specify an alternate input file.
 Specifying
 .Dq -
 as the input file causes
-.Nm revnetgroup
+.Nm
 to read from the standard input.
 .El
 .Sh FILES
-.Bl -tag -width Pa -compact
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxxxxxx -compact
 .It Pa /var/yp/\<domain\>Makefile
 The Makefile that calls
-.Nm makedbm
+.Xr makedbm 8
 and
-.Nm revnetgroup
+.Nm
 to build the YP databases.
 .It Pa /etc/netgroup
 The default netgroup database file.