Various cleanups and standardization.

27 files changed, 400 insertions, 261 deletions

diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index 8297b613f48..5cafd7cf2a8 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: oldrdist.1,v 1.6 2000/03/04 22:19:25 aaron Exp $
+.\"	$OpenBSD: oldrdist.1,v 1.7 2000/03/10 20:17:48 aaron Exp $
+.\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -67,7 +68,9 @@ Use the specified
 .Ar distfile .
 If
 .Ar distfile
-is `-', the standard input is used.
+is
+.Dq - ,
+the standard input is used.
 .El
 .Pp
 If either the
@@ -82,10 +85,10 @@ to use as the input.
 If no names are specified on the command line,
 .Nm rdist
 will update all of the files and directories listed in
-.Ar distfile  .
+.Ar distfile .
 Otherwise, the argument is taken to be the name of a file to be updated
-or the label of a command to execute. If label and file names conflict,
-it is assumed to be a label.
+or the label of a command to execute.
+If label and file names conflict, it is assumed to be a label.
 These may be used together to update specific files
 using specific commands.
 .Pp
@@ -95,7 +98,7 @@ Options specific to the second SYNOPSIS form:
 Forces
 .Nm rdist
 to interpret the remaining arguments as a small
-.Ar distfile  .
+.Ar distfile .
 .Pp
 The equivalent distfile is as follows.
 .Pp
@@ -114,65 +117,75 @@ The equivalent distfile is as follows.
 Options common to both forms:
 .Bl -tag -width Ic
 .It Fl b
-Binary comparison. Perform a binary comparison and update files if they differ
+Binary comparison.
+Perform a binary comparison and update files if they differ
 rather than comparing dates and sizes.
 .It Fl d Ar var=value
 Define
 .Ar var
 to have
-.Ar value  .
+.Ar value .
 The
 .Fl d
 option is used to define or override variable definitions in the
-.Ar distfile  .
+.Ar distfile .
 .Ar Value
 can be the empty string, one name, or a list of names surrounded by
 parentheses and separated by tabs and/or spaces.
 .It Fl h
-Follow symbolic links. Copy the file that the link points to rather than the
-link itself.
+Follow symbolic links.
+Copy the file that the link points to rather than the link itself.
 .It Fl i
 Ignore unresolved links.
 .Nm rdist
 will normally try to maintain the link structure of files being transferred
 and warn the user if all the links cannot be found.
 .It Fl m Ar host
-Limit which machines are to be updated. Multiple
+Limit which machines are to be updated.
+Multiple
 .Fl m
 arguments can be given to limit updates to a subset of the hosts listed in the
-.Ar distfile  .
+.Ar distfile .
 .It Fl n
-Print the commands without executing them. This option is
-useful for debugging
-.Ar distfile  .
+Print the commands without executing them.
+This option is useful for debugging
+.Ar distfile .
 .It Fl q
-Quiet mode. Files that are being modified are normally
-printed on standard output. The
+Quiet mode.
+Files that are being modified are normally printed on standard output.
+The
 .Fl q
 option suppresses this.
 .It Fl R
-Remove extraneous files. If a directory is being updated, any files that exist
+Remove extraneous files.
+If a directory is being updated, any files that exist
 on the remote host that do not exist in the master directory are removed.
 This is useful for maintaining truly identical copies of directories.
 .It Fl v
-Verify that the files are up to date on all the hosts. Any files
+Verify that the files are up to date on all the hosts.
+Any files
 that are out of date will be displayed but no files will be changed
 nor any mail sent.
 .It Fl w
-Whole mode. The whole file name is appended to the destination directory
-name. Normally, only the last component of a name is used when renaming files.
+Whole mode.
+The whole file name is appended to the destination directory
+name.
+Normally, only the last component of a name is used when renaming files.
 This will preserve the directory structure of the files being
-copied instead of flattening the directory structure. For example,
+copied instead of flattening the directory structure.
+For example,
 renaming a list of files such as ( dir1/f1 dir2/f2 ) to dir3 would create
 files dir3/dir1/f1 and dir3/dir2/f2 instead of dir3/f1 and dir3/f2.
 .It Fl y
-Younger mode. Files are normally updated if their
+Younger mode.
+Files are normally updated if their
 .Ar mtime
 and
 .Ar size
 (see
-.Xr stat  2  )
-disagree. The
+.Xr stat 2 )
+disagree.
+The
 .Fl y
 option causes
 .Nm rdist
@@ -185,7 +198,8 @@ A warning message is printed for files which are newer than the master copy.
 .Ar distfile
 contains a sequence of entries that specify the files
 to be copied, the destination hosts, and what operations to perform
-to do the updating. Each entry has one of the following formats:
+to do the updating.
+Each entry has one of the following formats:
 .Pp
 .Bd -literal -offset indent -compact
 <variable name> `=' <name list>
@@ -205,16 +219,23 @@ as the master copy for distribution.
 The
 .Ar destination list
 is the list of hosts to which these files are to be
-copied.  Each file in the source list is added to a list of changes
+copied.
+Each file in the source list is added to a list of changes
 if the file is out of date on the host which is being updated (second format) or
 the file is newer than the time stamp file (third format).
 .Pp
-Labels are optional. They are used to identify a command for partial updates.
+Labels are optional.
+They are used to identify a command for partial updates.
 .Pp
 Newlines, tabs, and blanks are only used as separators and are
-otherwise ignored. Comments begin with `#' and end with a newline.
+otherwise ignored.
+Comments begin with
+.Ql #
+and end with a newline.
 .Pp
-Variables to be expanded begin with `$' followed by one character or
+Variables to be expanded begin with
+.Ql $
+followed by one character or
 a name enclosed in curly braces (see the examples at the end).
 .Pp
 The source and destination lists have the following format:
@@ -226,18 +247,33 @@ or
 `(' <zero or more names separated by whitespace> `)'
 .Ed
 .Pp
-The shell meta-characters `[', `]', `{', `}', `*', and `?'
+The shell meta-characters
+.Ql [ ,
+.Ql \&] ,
+.Ql { ,
+.Ql } ,
+.Ql * ,
+and
+.Ql ?
 are recognized and expanded (on the local host only) in the same way as
-.Xr csh  1  .
+.Xr csh 1 .
 They can be escaped with a backslash.
-The `~' character is also expanded in the same way as
+The
+.Ql ~
+character is also expanded in the same way as
 .Xr csh 1
 but is expanded separately on the local and destination hosts.
 When the
 .Fl w
-option is used with a file name that begins with `~', everything except the
+option is used with a file name that begins with
+.Ql ~ ,
+everything except the
 home directory is appended to the destination name.
-File names which do not begin with `/' or `~' use the destination user's
+File names which do not begin with
+.Ql /
+or
+.Ql ~
+use the destination user's
 home directory as the root directory for the rest of the file name.
 .Pp
 The command list consists of zero or more commands of the following
@@ -266,32 +302,45 @@ the destination name is not specified,
 the source file name is used.
 Directories in the path name will be created if they
 do not exist on the remote host.
+.Pp
 To help prevent disasters, a non-empty directory on a target host will
 never be replaced with a regular file or a symbolic link.
-However, under the `\-R' option a non-empty directory will be removed
+However, under the
+.Fl R
+option a non-empty directory will be removed
 if the corresponding filename is completely absent on the master host.
 The
 .Ar options
-are `\-R', `\-h', `\-i', `\-v', `\-w', `\-y', and `\-b'
+are
+.Fl R ,
+.Fl h ,
+.Fl i ,
+.Fl v ,
+.Fl w ,
+.Fl y ,
+and
+.Fl b
 and have the same semantics as
 options on the command line except they only apply to the files
 in the source list.
 The login name used on the destination host is the same as the local host
-unless the destination name is of the format ``login@host''.
+unless the destination name is of the format
+.Dq login@host .
 .Pp
 The
 .Ic notify
 command is used to mail the list of files updated (and any errors
 that may have occurred) to the listed names.
-If no `@' appears in the name, the destination host is appended to
-the name
+If no
+.Ql @
+appears in the name, the destination host is appended to the name
 (e.g., name1@host, name2@host, ...).
 .Pp
 The
 .Ic except
 command is used to update all of the files in the source list except
 for the files listed in
-.Ar name list  .
+.Ar name list .
 This is usually used to copy everything in a directory except certain files.
 .Pp
 The
@@ -302,20 +351,26 @@ command except that
 .Ar pattern list
 is a list of regular expressions
 (see
-.Xr ed  1
+.Xr ed 1
 for details).
 If one of the patterns matches some string within a file name, that file will
 be ignored.
-Note that since `\e' is a quote character, it must be doubled to become
-part of the regular expression.  Variables are expanded in
+Note that since
+.Ql \e
+is a quote character, it must be doubled to become
+part of the regular expression.
+Variables are expanded in
 .Ar pattern list
-but not shell file pattern matching characters.  To include a `$', it
-must be escaped with `\e'.
+but not shell file pattern matching characters.
+To include a
+.Ql $ ,
+it must be escaped with
+.Ql \e .
 .Pp
 The
 .Ic special
 command is used to specify
-.Xr sh  1
+.Xr sh 1
 commands that are to be executed on the
 remote host after the file in
 .Ar name list
@@ -323,13 +378,17 @@ is updated or installed.
 If the
 .Ar name list
 is omitted then the shell commands will be executed
-for every file updated or installed.  The shell variable FILE is set
+for every file updated or installed.
+The shell variable FILE is set
 to the current filename before executing the commands in
-.Ar string  .
+.Ar string .
 .Ar string
-starts and ends with `"' and can cross multiple lines in
+starts and ends with
+.Ql \&"
+and can cross multiple lines in
 .Ar distfile .
-Multiple commands to the shell should be separated by `;'.
+Multiple commands to the shell should be separated by
+.Ql \&; .
 Commands are executed in the user's home directory on the host
 being updated.
 The
@@ -403,6 +462,9 @@ facility.
 .Nm rdist
 aborts on files which have a negative mtime (before Jan 1, 1970).
 .Pp
-There should be a `force' option to allow replacement of non-empty directories
-by regular files or symlinks.  A means of updating file modes and owners
+There should be a 
+.Dq force
+option to allow replacement of non-empty directories
+by regular files or symlinks.
+A means of updating file modes and owners
 of otherwise identical files is also needed.
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 2702266d0c5..feab72f3b2a 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: passwd.1,v 1.8 1999/06/05 01:21:36 aaron Exp $
+.\"	$OpenBSD: passwd.1,v 1.9 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -51,8 +52,8 @@
 .\" This should really be: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]]] [user]
 .Sh DESCRIPTION
 .Nm passwd
-changes the user's local, Kerberos, or YP password.  First, the user is prompted
-for their current password.
+changes the user's local, Kerberos, or YP password.
+First, the user is prompted for their current password.
 If the current password is correctly typed, a new password is
 requested.
 The new password must be entered twice to avoid typing errors.
@@ -64,15 +65,19 @@ Its total length must be less than
 (currently 128 characters).
 Numbers, upper case letters and meta-characters
 are encouraged.
+.Pp
+The options are as follows:
 .Bl -tag -width flag
 .It Fl l
 Causes the password to be updated only in the local
-password file.  When changing only the local password,
-.Xr pwd_mkdb  8
+password file.
+When changing only the local password,
+.Xr pwd_mkdb 8
 is used to update the password databases.
 .It Fl y
 Forces the YP password database entry to be changed, even if
-the user has an entry in the local database.  The
+the user has an entry in the local database.
+The
 .Xr rpc.yppasswdd 8
 daemon should be running on the YP master server.
 .It Fl k
@@ -91,10 +96,10 @@ flag is specified:
 .It Fl n Ar name
 Specifies a
 .Ar name
-that will be used as the principal name rather  than  the  username
+that will be used as the principal name rather than the username
 of the user running
 .Nm passwd .
-(This is determined from the ticket file  if  it exists;  otherwise,
+(This is determined from the ticket file if it exists; otherwise,
 it is determined from the Unix user ID.)
 .It Fl i Ar instance
 Specifies an
@@ -105,7 +110,7 @@ Specifies a
 .Ar realm
 instead of the local realm.
 .It Fl u Ar username[.instance][@realm]
-Specifies a fully qualified kerberos principal.
+Specifies a fully qualified Kerberos principal.
 .El
 .Pp
 This is the behavior if no flags are specified:
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index a4ecf7ccc0e..9dbb9492db4 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: paste.1,v 1.4 1999/06/05 01:21:36 aaron Exp $
+.\"	$OpenBSD: paste.1,v 1.5 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -59,7 +60,7 @@ of empty lines.
 .Pp
 The options are as follows:
 .Bl -tag -width Fl
-.It Fl d  Ar list
+.It Fl d Ar list
 Use one or more of the provided characters to replace the newline
 characters instead of the default tab.
 The characters in
@@ -105,11 +106,11 @@ option.
 .El
 .Pp
 If
-.Ql Fl
+.Dq -
 is specified for one or more of the input files, the standard
 input is used; standard input is read one line at a time, circularly,
 for each instance of
-.Ql Fl .
+.Dq - .
 .Pp
 The
 .Nm paste
diff --git a/usr.bin/pctr/pctr.1 b/usr.bin/pctr/pctr.1
index 86da7e1cc34..6c023d03b6c 100644
--- a/usr.bin/pctr/pctr.1
+++ b/usr.bin/pctr/pctr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pctr.1,v 1.3 1998/12/16 02:38:50 aaron Exp $
+.\"	$OpenBSD: pctr.1,v 1.4 2000/03/10 20:17:49 aaron Exp $
 .\"
 .\" Copyright (c) 1998, Jason Downs.  All rights reserved.
 .\"
@@ -43,9 +43,9 @@ By default, the
 .Nm
 command displays the current values of the TSC and any vendor specific
 counter registers.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
-There is one available option:
 .It Fl l Ar 5 | 6
 List all possible vendor specific counters.  The argument specifies which
 .Dq family
@@ -53,14 +53,10 @@ to display; it defaults to the
 .Dq family
 designation of the current processor.
 .El
-.Sh RETURN VALUES
+.Pp
 The
 .Nm
 program exits with a value of 0 on success or 1 on failure.
-.Sh BUGS
-The
-.Nm
-program is still orientated towards Intel brand microprocessors.
 .Sh SEE ALSO
 .Xr pctr 4
 .Sh HISTORY
@@ -68,3 +64,7 @@ The
 .Nm
 program appeared in
 .Ox 2.0 .
+.Sh BUGS
+The
+.Nm
+program is still orientated towards Intel brand microprocessors.
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 4bbf1491d24..c7fd249906a 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: pr.1,v 1.10 2000/03/06 03:15:59 aaron Exp $
+.\"	$OpenBSD: pr.1,v 1.11 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,15 +100,13 @@ utility is a printing and pagination filter for text files.
 When multiple input files are specified, each is read, formatted,
 and written to standard output.
 By default, the input is separated into 66-line pages, each with
-.sp
-.in +2
-.ti -2
-\(bu A 5-line header with the page number, date, time, and
+.Bl -bullet -offset indent
+.It
+A 5-line header with the page number, date, time, and
 the pathname of the file.
-.sp
-.ti -2
-\(bu A 5-line trailer consisting of blank lines.
-.in -2
+.It
+A 5-line trailer consisting of blank lines.
+.El
 .Pp
 Optionally, the trailer can be replaced by a
 .Em <form-feed>
@@ -179,7 +178,8 @@ This option requires the use of the
 .Fl column
 option.
 .It Fl d
-Produce output that is double spaced. An extra
+Produce output that is double spaced.
+An extra
 .Em <newline>
 character is output following every
 .Em <newline>
@@ -285,7 +285,8 @@ output.
 If
 .Ar char
 (any nondigit character) is given, it is appended to the line number to
-separate it from whatever follows. The default for
+separate it from whatever follows.
+The default for
 .Ar char
 is a
 .Em <tab> .
@@ -338,14 +339,14 @@ If no
 operands are specified, or if a
 .Ar file
 operand is
-.Sq Fl ,
+.Dq - ,
 the standard input is used.
 The standard input is used only if no
 .Ar file
 operands are specified, or if a
 .Ar file
 operand is
-.Sq Fl .
+.Dq - .
 .El
 .Pp
 The
@@ -377,7 +378,8 @@ The interpretation of
 .Em <form-feed>s
 in the input stream is that they are special
 .Em <newline>s
-which have the side effect of causing a page break.  While this works
+which have the side effect of causing a page break.
+While this works
 correctly for all cases, strict interpretation also implies that the
 common convention of placing a
 .Em <form-feed>
@@ -407,7 +409,8 @@ 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
+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.
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index f83f1e43fe4..7f6b7be5327 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: printenv.1,v 1.3 1998/09/27 16:57:50 aaron Exp $
+.\"	$OpenBSD: printenv.1,v 1.4 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -46,7 +47,8 @@
 .Sh DESCRIPTION
 .Nm printenv
 prints out the names and values of the variables in the environment,
-with one name/value pair per line.  If
+with one name/value pair per line.
+If
 .Ar name
 is specified, only
 its value is printed.
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index b60a8a83657..7de1452c650 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: printf.1,v 1.9 2000/03/06 03:15:59 aaron Exp $
+.\"	$OpenBSD: printf.1,v 1.10 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -49,14 +50,14 @@
 .Nm printf
 formats and prints its arguments, after the first, under control
 of the
-.Ar format  .
+.Ar format .
 The
 .Ar format
 is a character string which contains three types of objects: plain characters,
 which are simply copied to standard output, character escape sequences which
 are converted and copied to the standard output, and format specifications,
 each of which causes printing of the next successive
-.Ar argument  .
+.Ar argument .
 .Pp
 The
 .Ar arguments
@@ -66,8 +67,7 @@ after the first are treated as strings if the corresponding format is
 or
 .Cm s ;
 otherwise it is evaluated as a C constant, with the following extensions:
-.Pp
-.Bl -bullet -offset indent -compact
+.Bl -bullet -offset indent
 .It
 A leading plus or minus sign is allowed.
 .It
@@ -77,15 +77,15 @@ code of the next character.
 .El
 .Pp
 The format string is reused as often as necessary to satisfy the
-.Ar arguments  .
+.Ar arguments .
 Any extra format specifications are evaluated with zero or the null
 string.
 .Pp
 Character escape sequences are in backslash notation as defined in
 .St -ansiC .
-The characters and their meanings
-are as follows:
-.Bl -tag -width Ds -offset indent
+The characters and their meanings are as follows:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
 .It Cm \ee
 Write an <escape> character.
 .It Cm \ea
@@ -117,7 +117,7 @@ octal number
 Each format specification is introduced by the percent
 .Pq Sq \&%
 character.
-The remainder of the format specification includes,
+The remainder of the format specifiers include,
 in the following order:
 .Bl -tag -width Ds
 .It "Zero or more of the following flags:"
@@ -126,29 +126,33 @@ in the following order:
 Specifies that the value should be printed in an
 .Dq alternate form .
 For the
-.Cm c  ,
+.Cm c ,
 .Cm d ,
 and
 .Cm s
-formats, this option has no effect.  For the
+formats, this option has no effect.
+For the
 .Cm o
 format the precision of the number is increased to force the first
-character of the output string to a zero.  For the
+character of the output string to a zero.
+For the
 .Cm x
 .Pq Cm X
 format, a non-zero result has the string
 .Li 0x
 .Pq Li 0X
-prepended to it.  For
-.Cm e  ,
+prepended to it.
+For
+.Cm e ,
 .Cm E ,
-.Cm f  ,
+.Cm f ,
 .Cm g ,
 and
 .Cm G
 formats, the result will always contain a decimal point, even if no
 digits follow the point (normally, a decimal point only appears in the
-results of those formats if a digit follows the decimal point).  For
+results of those formats if a digit follows the decimal point).
+For
 .Cm g
 and
 .Cm G
@@ -163,21 +167,24 @@ Specifies that there should always be
 a sign placed before the number when using signed formats.
 .It Sq \&\ \&
 A space specifies that a blank should be left before a positive number
-for a signed format.  A
-.Dq +
+for a signed format.
+A
+.Ql +
 overrides a space if both are used.
 .It Cm \&0
 A zero character specifies that zero-padding should be used
-rather than blank-padding.  This flag is ignored if used with a precision
+rather than blank-padding.
+This flag is ignored if used with a precision
 specifier and any of the
 .Cm d , i , o , u ,
 or
 .Cm x
 .Pq Cm X
-formats.  A
-.Dq \&-
+formats.
+A
+.Ql \&-
 overrides a
-.Dq \&0
+.Ql \&0
 if both are used.
 .El
 .It "Field Width:"
@@ -206,7 +213,7 @@ A character which indicates the type of format to use (one of
 .El
 .Pp
 A field width or precision may be
-.Dq \&*
+.Ql \&*
 instead of a digit string.
 In this case an
 .Ar argument
@@ -247,7 +254,7 @@ is one digit before the decimal point and the number after is equal to
 the precision specification for the argument; when the precision is
 missing, 6 digits are produced.
 An upper-case
-.Dq E
+.Sq E
 is used for an
 .Cm E
 format.
@@ -276,7 +283,7 @@ indicated by the precision specification is reached; however if the
 precision is 0 or missing, all characters in the string are printed.
 .It Cm \&%
 Print a
-.Dq \&% ;
+.Ql \&% ;
 no argument is used.
 .El
 .Pp
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index b32a9d24e5b..dcdb6276eed 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: quota.1,v 1.9 2000/03/06 03:17:39 aaron Exp $
+.\"	$OpenBSD: quota.1,v 1.10 2000/03/10 20:17:49 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index f3d4a71dce5..c141f472d41 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: ranlib.1,v 1.5 1999/08/27 08:43:22 fgsch Exp $
+.\"	$OpenBSD: ranlib.1,v 1.6 2000/03/10 20:17:50 aaron Exp $
+.\"
 .\" Copyright (c) 1990 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -47,14 +48,18 @@
 creates a table of external references for archive libraries,
 normally used by the loader,
 .Xr ld 1 .
-This table is named ``__.SYMDEF'' and is prepended to the archive.
+This table is named
+.Dq __.SYMDEF
+and is prepended to the archive.
 Files in the archive which are not executable and symbols which are
 uninteresting to the loader are ignored.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl t
-Set the modification time of the __.SYMDEF file.
+Set the modification time of the
+.Pa __.SYMDEF
+file.
 This time is compared by the loader with the modification time of the
 archive to verify that the table is up-to-date with respect to the
 archive.
@@ -63,7 +68,9 @@ archive (for example, by a
 .Xr cp 1 ) ,
 the
 .Fl t
-option can be used to ``touch'' the modification time so that it
+option can be used to
+.Dq touch
+the modification time so that it
 appears that the table is up-to-date.
 This is also useful after using the
 .Fl t
@@ -71,7 +78,9 @@ option of
 .Xr make 1 .
 .El
 .Sh ENVIRONMENT
-.Bl -tag -width TMPDIR -compact
+The following environment variables affect the execution of
+.Nm ranlib :
+.Bl -tag -width TMPDIR
 .It Ev TMPDIR
 The pathname of the directory to use when creating temporary files.
 .El
diff --git a/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index 62565a18c1c..51f22c04d59 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: ranlib.5,v 1.3 1998/09/27 16:57:50 aaron Exp $
+.\"	$OpenBSD: ranlib.5,v 1.4 2000/03/10 20:17:50 aaron Exp $
+.\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -54,9 +55,12 @@ The
 function
 prepends a new file to the archive which has three separate parts.
 The first part is a standard archive header, which has a special name
-field,  "__.SYMDEF".
+field,
+.Dq __.SYMDEF .
 .Pp
-The second part is a ``long'' followed by a list of ranlib structures.
+The second part is a
+.Li long
+followed by a list of ranlib structures.
 The long is the size, in bytes, of the list of ranlib structures.
 Each of the ranlib structures consists of a zero based offset into the
 next section (a string table of symbols) and an offset from the beginning
@@ -64,7 +68,9 @@ of the archive to the start of the archive file which defines the symbol.
 The actual number of ranlib structures is this number divided by the size
 of an individual ranlib structure.
 .Pp
-The third part is a ``long'' followed by a string table.
+The third part is a
+.Li long
+followed by a string table.
 The long is the size, in bytes of the string table.
 .Sh SEE ALSO
 .Xr ar 1 ,
diff --git a/usr.bin/readlink/readlink.1 b/usr.bin/readlink/readlink.1
index 74021c8e5bb..fcbd48645c4 100644
--- a/usr.bin/readlink/readlink.1
+++ b/usr.bin/readlink/readlink.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readlink.1,v 1.5 2000/03/05 00:28:53 aaron Exp $
+.\"	$OpenBSD: readlink.1,v 1.6 2000/03/10 20:17:50 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -46,11 +46,12 @@
 .Ar file
 .Sh DESCRIPTION
 The
-.Nm readlink
+.Nm
 utility when invoked with the pathname of a symbolic link as its
 argument dereferences the symbolic link and prints the name of target
-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
+on standard output.
+If readlink is invoked with an argument other
+than the pathname of a symbolic link, it exits with a nonzero exit
 code without printing anything.
 .Pp
 The options are as follows:
@@ -63,12 +64,12 @@ Do not print a trailing newline character.
 .El
 .Pp
 The
-.Nm readlink
+.Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr readlink 2
 .Sh HISTORY
 The
-.Nm readlink
+.Nm
 utility first appeared in
 .Ox 2.1 .
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 7ee47b1cfa5..9a8ce764511 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: renice.8,v 1.9 2000/03/04 20:02:23 aaron Exp $
+.\"	$OpenBSD: renice.8,v 1.10 2000/03/10 20:17:50 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -98,7 +99,8 @@ all processes owned by users daemon and root.
 .Pp
 Users other than the super-user may only alter the priority of
 processes they own,
-and can only monotonically increase their ``nice value''
+and can only monotonically increase their
+.Dq nice value
 within the range 0 to
 .Dv PRIO_MAX
 (20).
@@ -113,7 +115,9 @@ to
 Useful priorities are:
 20 (the affected processes will run only when nothing else
 in the system wants to),
-0 (the ``base'' scheduling priority),
+0 (the
+.Dq base
+scheduling priority),
 anything negative (to make things go very fast).
 .Sh FILES
 .Bl -tag -width /etc/passwd -compact
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index e186860fc84..8b41514890d 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rlogin.1,v 1.5 1999/06/05 01:21:38 aaron Exp $
+.\"	$OpenBSD: rlogin.1,v 1.6 2000/03/10 20:17:50 aaron Exp $
 .\"	$NetBSD: rlogin.1,v 1.4 1995/08/18 15:07:35 pk Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -48,15 +48,16 @@
 .Op Fl l Ar username
 .Ar host
 .Sh DESCRIPTION
-.Nm rlogin
+.Nm
 starts a terminal session on a remote host
-.Ar host  .
+.Ar host .
 .Pp
-.Nm rlogin
+.Nm
 first attempts to use the Kerberos authorization mechanism, described below.
 If the remote host does not support Kerberos the standard Berkeley
 .Pa rhosts
 authorization mechanism is used.
+.Pp
 The options are as follows:
 .Bl -tag -width flag
 .It Fl 8
@@ -80,7 +81,9 @@ option turns off all Kerberos authentication.
 .It Fl L
 The
 .Fl L
-option allows the rlogin session to be run in ``litout'' (see
+option allows the rlogin session to be run in
+.Dq litout
+(see
 .Xr tty 4 )
 mode.
 .It Fl d
@@ -93,7 +96,8 @@ on the TCP sockets used for communication with the remote host.
 The
 .Fl e
 option allows user specification of the escape character, which is
-``~'' by default.
+.Ql ~
+by default.
 This specification may be as a literal character, or as an octal
 value in the form \ennn.
 .It Fl k Ar realm
@@ -103,7 +107,7 @@ option requests rlogin to obtain tickets for the remote host
 in realm
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl x
 The
 .Fl x
@@ -124,17 +128,27 @@ for the remote login.
 If this option is not specified, your local username will be used.
 .El
 .Pp
-A line of the form ``<escape char>.'' disconnects from the remote host.
-Similarly, the line ``<escape char>^Z'' will suspend the
-.Nm rlogin
-session, and ``<escape char><delayed-suspend char>'' suspends the
+A line of the form
+.Dq <escape char>.
+disconnects from the remote host.
+Similarly, the line
+.Dq <escape char>^Z
+will suspend the
+.Nm
+session, and
+.Dq <escape char><delayed-suspend char>
+suspends the
 send portion of the rlogin, but allows output from the remote system.
-By default, the tilde (``~'') character is the escape character, and
-normally control-Y (``^Y'') is the delayed-suspend character.
+By default, the tilde
+.Pq Ql ~
+character is the escape character, and
+normally control-Y
+.Pq Ql ^Y
+is the delayed-suspend character.
 .Pp
 All echoing takes place at the remote site, so that (except for delays)
 the
-.Nm rlogin
+.Nm
 is transparent.
 Flow control via ^S/^Q and flushing of input and output on interrupts
 are handled properly.
@@ -144,7 +158,7 @@ Each user may have a private authorization list in the file
 in their home directory.
 Each line in this file should contain a Kerberos principal name of the
 form
-.Ar principal.instance@realm  .
+.Ar principal.instance@realm .
 If the originating user is authenticated to one of the principals named
 in
 .Pa .klogin ,
@@ -157,7 +171,7 @@ there is no
 file.
 Otherwise a login and password will be prompted for on the remote machine
 as in
-.Xr login  1  .
+.Xr login 1 .
 To avoid certain security problems, the
 .Pa .klogin
 file must be owned by
@@ -165,10 +179,10 @@ the remote user.
 .Pp
 If Kerberos authentication fails, a warning message is printed and the
 standard Berkeley
-.Nm rlogin
+.Nm
 is used instead.
 .Sh ENVIRONMENT
-The following environment variable is utilized by
+The following environment variables affect the execution of
 .Nm rlogin :
 .Bl -tag -width TERM
 .It Ev TERM
@@ -187,7 +201,7 @@ command appeared in
 .Sh BUGS
 .Nm rlogin
 will be replaced by
-.Xr telnet  1
+.Xr telnet 1
 in the near future.
 .Pp
 More of the environment should be propagated.
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 10e41636e84..446911e72c0 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rpcgen.1,v 1.5 1999/07/07 10:50:07 aaron Exp $
+.\" $OpenBSD: rpcgen.1,v 1.6 2000/03/10 20:17:50 aaron Exp $
 .\" $NetBSD: rpcgen.1,v 1.5.2.1 1995/12/05 02:51:02 jtc Exp $
 .\" from: @(#)rpcgen.new.1	1.1 90/11/09 TIRPC 1.0; from 40.10 of 10/10/89
 .\" Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
@@ -39,16 +39,14 @@
 .Op Fl o Ar outfile
 .Op Ar infile
 .Sh DESCRIPTION
-.Nm rpcgen
+.Nm
 is a tool that generates C code to implement an
 .Tn RPC
 protocol.
-The input to
-.Nm
-is a language similar to C known as
+The input is a language similar to C known as
 .Tn RPC
 Language (Remote Procedure Call Language).
-.Nm rpcgen
+.Nm
 is normally used as in the first synopsis where
 it takes an input file and generates up to four output files.
 If the
@@ -56,7 +54,7 @@ If the
 is named
 .Pa proto.x ,
 then
-.Nm rpcgen
+.Nm
 will generate a header file in
 .Pa proto.h ,
 .Tn XDR
@@ -77,13 +75,15 @@ With the
 .Fl S\&c
 option,
 it will also generate sample code which would illustrate how to use the
-remote procedures on the client side. This code would be created in
+remote procedures on the client side.
+This code would be created in
 .Pa proto_client.c .
 With the
 .Fl S\&s
 option,
 it will also generate a sample server code which would illustrate how to write
-the remote procedures. This code would be created in
+the remote procedures.
+This code would be created in
 .Pa proto_server.c .
 .Pp
 The server created can be started both by the port monitors
@@ -99,7 +99,7 @@ The name of the transport must be specified
 by setting up the environment variable
 .Ev PM_TRANSPORT .
 When the server generated by
-.Nm rpcgen
+.Nm
 is executed,
 it creates server handles for all the transports
 specified in
@@ -150,10 +150,10 @@ The other three synopses shown above are used when
 one does not want to generate all the output files,
 but only a particular one.
 Some examples of their usage is described in the
-EXAMPLE
+.Sx EXAMPLES
 section below.
 When
-.Nm rpcgen
+.Nm
 is executed with the
 .Fl s
 option,
@@ -167,7 +167,7 @@ it creates a server for the transport specified by
 If
 .Ar infile
 is not specified,
-.Nm rpcgen
+.Nm
 accepts the standard input.
 .Pp
 The C preprocessor,
@@ -175,9 +175,9 @@ The C preprocessor,
 is run on the input file before it is actually interpreted by
 .Nm rpcgen .
 For each type of output file,
-.Nm rpcgen
+.Nm
 defines a special preprocessor symbol for use by the
-.Nm rpcgen
+.Nm
 programmer:
 .Pp
 .Bl -tag -width RPC_CLNT -compact
@@ -205,7 +205,7 @@ uninterpreted by
 .Pp
 For every data type referred to in
 .Ar infile
-.Nm rpcgen
+.Nm
 assumes that there exists a
 routine with the string
 .Dq xdr_
@@ -217,20 +217,23 @@ Providing an undefined data type
 allows customization of
 .Tn XDR
 routines.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Generate all the files including sample code for client and server side.
 .It Fl b
 This generates code for the
 .Tn SunOS4.1
-style of RPC. This is the default.
+style of RPC.
+This is the default.
 .It Fl c
 Compile into
 .Tn XDR
 routines.
 .It Fl C
-Generate code in ANSI C. This option also generates code that could be
+Generate code in ANSI C.
+This option also generates code that could be
 compiled with the C++ compiler.
 .It Fl D Ar name Ns Op Ar =value
 Define a symbol
@@ -254,7 +257,7 @@ header file which supports
 dispatch tables.
 .It Fl K Ar secs
 By default, services created using
-.Nm rpcgen
+.Nm
 wait 120 seconds
 after servicing a request before exiting.
 That interval can be changed using the
@@ -276,7 +279,7 @@ spawn a new process in response to a service request.
 If it is known that a server will be used with such a monitor, the
 server should exit immediately on completion.
 For such servers,
-.Nm rpcgen
+.Nm
 should be used with
 .Dq Fl K No -1 .
 .It Fl l
@@ -304,12 +307,15 @@ so as to compile a server that serves multiple transports.
 Use the newstyle of
 .Nm rpcgen .
 This allows procedures to have multiple arguments.
-It also uses the style of parameter passing that closely resembles C. So, when
+It also uses the style of parameter passing that closely resembles C.
+So, when
 passing an argument to a remote procedure you do not have to pass a pointer to
-the argument but the argument itself. This behaviour is different from the oldstyle
+the argument but the argument itself.
+This behaviour is different from the oldstyle
 of
-.Nm rpcgen
-generated code. The newstyle is not the default case because of
+.Nm
+generated code.
+The newstyle is not the default case because of
 backward compatibility.
 .It Fl o Ar outfile
 Specify the name of the output file.
@@ -336,7 +342,8 @@ and
 .Em udp
 [see
 .Xr rpc 3
-for the meanings associated with these classes. Note:
+for the meanings associated with these classes.
+Note:
 .Bx
 currently supports only the
 .Em tcp
@@ -351,7 +358,8 @@ Generate sample code to show the use of remote procedure and how to bind
 to the server before calling the client side stubs generated by
 .Nm rpcgen .
 .It Fl S\&s
-Generate skeleton code for the remote procedures on the server side. You would need
+Generate skeleton code for the remote procedures on the server side.
+You would need
 to fill in the actual code for the remote procedures.
 .It Fl t
 Compile into
@@ -398,7 +406,7 @@ The server code generated with
 option refers to the transport indicated by
 .Em netid
 and hence is very site specific.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The command
 .Pp
 .Bd -literal -offset indent
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 6a03620afec..61942a10434 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpcinfo.8,v 1.4 1999/06/05 01:21:38 aaron Exp $
+.\"	$OpenBSD: rpcinfo.8,v 1.5 2000/03/10 20:17:50 aaron Exp $
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
 .\"
 .Dd December 17, 1987
@@ -28,20 +28,22 @@
 .Fl d
 .Ar program version
 .Sh DESCRIPTION
-.Nm rpcinfo
+.Nm
 makes an
 .Tn RPC
 call to an
 .Tn RPC
 server and reports what it finds.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width indent
 .It Fl p
 Probe the portmapper on
 .Ar host ,
 and print a list of all registered
 .Tn RPC
-programs.  If
+programs.
+If
 .Ar host
 is not specified, it defaults to the value returned by
 .Xr hostname 1 .
@@ -100,17 +102,17 @@ argument can be either a name or a number.
 If a
 .Ar version
 is specified,
-.Nm rpcinfo
+.Nm
 attempts to call that version of the specified
 .Ar program .
 Otherwise,
-.Nm rpcinfo
+.Nm
 attempts to find all the registered version
 numbers for the specified
 .Ar program
 by calling version 0 (which is presumed not
 to exist; if it does exist,
-.Nm rpcinfo
+.Nm
 attempts to obtain this information by calling
 an extremely high version
 number instead) and attempts to call each registered version.
@@ -158,7 +160,7 @@ service use:
 .Sh BUGS
 In releases prior to SunOS 3.0, the Network File System (NFS) did not
 register itself with the portmapper;
-.Nm rpcinfo
+.Nm
 cannot be used to make
 .Tn RPC
 calls to the
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 89f2f4831a7..4f53d6be9f9 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: rsh.1,v 1.5 1999/06/05 01:21:38 aaron Exp $
+.\"	$OpenBSD: rsh.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -46,20 +47,21 @@
 .Ar host
 .Op Ar command
 .Sh DESCRIPTION
-.Nm rsh
+.Nm
 executes
 .Ar command
 on
-.Ar host  .
+.Ar host .
 .Pp
-.Nm rsh
+.Nm
 copies its standard input to the remote command, the standard
 output of the remote command to its standard output, and the
 standard error of the remote command to its standard error.
 Interrupt, quit and terminate signals are propagated to the remote
 command;
-.Nm rsh
+.Nm
 normally terminates when the remote command does.
+.Pp
 The options are as follows:
 .Bl -tag -width flag
 .It Fl K
@@ -70,7 +72,7 @@ option turns off all Kerberos authentication.
 The
 .Fl d
 option turns on socket debugging (using
-.Xr setsockopt  2  )
+.Xr setsockopt 2 )
 on the
 .Tn TCP
 sockets used for communication with the remote host.
@@ -78,11 +80,11 @@ sockets used for communication with the remote host.
 The
 .Fl k
 option causes
-.Nm rsh
+.Nm
 to obtain tickets for the remote host in
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl l
 By default, the remote username is the same as the local username.
 The
@@ -90,7 +92,7 @@ The
 option allows the remote name to be specified.
 Kerberos authentication is used, and authorization is determined
 as in
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .It Fl n
 The
 .Fl n
@@ -111,7 +113,7 @@ This may introduce a significant delay in response time.
 If no
 .Ar command
 is specified, you will be logged in on the remote host using
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .Pp
 Shell meta-characters which are not quoted are interpreted on local machine,
 while quoted meta-characters are interpreted on the remote machine.
@@ -148,18 +150,18 @@ to
 .Xr rcmd 3
 .Sh HISTORY
 The
-.Nm rsh
+.Nm
 command appeared in
 .Bx 4.2 .
 .Sh BUGS
 If you are using
-.Xr csh  1
+.Xr csh 1
 and put a
-.Nm rsh
+.Nm
 in the background without redirecting its input away from the terminal,
 it will block even if no reads are posted by the remote command.
 If no input is desired you should redirect the input of
-.Nm rsh
+.Nm
 to
 .Pa /dev/null
 using the
@@ -168,16 +170,16 @@ option.
 .Pp
 You cannot run an interactive command
 (like
-.Xr rogue  6
+.Xr rogue 6
 or
-.Xr vi  1  )
+.Xr vi 1 )
 using
-.Nm rsh  ;
+.Nm rsh ;
 use
-.Xr rlogin  1
+.Xr rlogin 1
 instead.
 .Pp
 Stop signals stop the local
-.Nm rsh
+.Nm
 process only; this is arguably wrong, but currently hard to fix for reasons
 too complicated to explain here.
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 4762e6b23ea..b05398c12f7 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,5 +1,4 @@
-.\"	$OpenBSD: rup.1,v 1.5 2000/03/05 00:28:54 aaron Exp $
-.\" -*- nroff -*-
+.\"	$OpenBSD: rup.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -73,7 +72,7 @@ daemon must be running on the remote host for this command to
 work.
 .Nm
 uses an RPC protocol defined in /usr/include/rpcsvc/rstat.x.
-.Sh EXAMPLE
+.Sh EXAMPLES
 .Bd -unfilled -offset indent -compact
 example% rup otherhost
 otherhost      up 6 days, 16:45,  load average: 0.20, 0.23, 0.18
@@ -86,14 +85,15 @@ The
 .Xr rpc.rstatd 8
 daemon has not been started on the remote host.
 .It rup: RPC: Timed out
-A communication error occurred.  Either the network is
-excessively congested, or the
+A communication error occurred.
+Either the network is excessively congested, or the
 .Xr rpc.rstatd 8
 daemon has terminated on the remote host.
 .It rup: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
 .Xr portmap 8 ),
-and cannot accommodate any RPC-based services.  The host may be down.
+and cannot accommodate any RPC-based services.
+The host may be down.
 .El
 .Sh SEE ALSO
 .Xr ruptime 1 ,
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 8de3a8c6dc2..670ef4d3820 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: ruptime.1,v 1.7 2000/03/06 03:17:39 aaron Exp $
+.\"	$OpenBSD: ruptime.1,v 1.8 2000/03/10 20:17:51 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -42,9 +43,9 @@
 .Nm ruptime
 .Op Fl alrtu
 .Sh DESCRIPTION
-.Nm ruptime
+.Nm
 gives a status line like
-.Ar uptime
+.Xr uptime 1
 for each machine on the local network; these are formed from packets
 broadcast by each host on the network once a minute.
 .Pp
@@ -80,6 +81,6 @@ data files
 .Xr rwhod 8
 .Sh HISTORY
 The
-.Nm ruptime
+.Nm
 command appeared in
 .Bx 4.2 .
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 182427f0d44..c46d2a2f90e 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: rusers.1,v 1.5 2000/03/05 00:28:54 aaron Exp $
+.\"	$OpenBSD: rusers.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -44,14 +45,14 @@
 .Op Ar host ...
 .Sh DESCRIPTION
 The
-.Nm rusers
+.Nm
 command produces output similar to
 .Xr who 1 ,
 but for the list of hosts or all machines on the local
 network. For each host responding to the rusers query,
 the hostname with the names of the users currently logged
 on is printed on each line. The
-.Nm rusers
+.Nm
 command will wait for
 one minute to catch late responders.
 .Pp
@@ -72,14 +73,15 @@ The
 .Xr rpc.rusersd 8
 daemon has not been started on the remote host.
 .It rusers: RPC: Timed out
-A communication error occurred.  Either the network is
-excessively congested, or the
+A communication error occurred.
+Either the network is excessively congested, or the
 .Xr rpc.rusersd 8
 daemon has terminated on the remote host.
 .It rusers: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
 .Xr portmap 8 ),
-and cannot accommodate any RPC-based services.  The host may be down.
+and cannot accommodate any RPC-based services.
+The host may be down.
 .El
 .Sh SEE ALSO
 .Xr rwho 1 ,
@@ -89,7 +91,7 @@ and cannot accommodate any RPC-based services.  The host may be down.
 .Xr rpc.rusersd 8
 .Sh HISTORY
 The
-.Nm rusers
+.Nm
 command
 appeared in
 .Tn SunOS .
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 376378cd908..142edb332c5 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: rwall.1,v 1.3 1999/06/05 01:21:39 aaron Exp $
+.\"	$OpenBSD: rwall.1,v 1.4 2000/03/10 20:17:51 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -44,7 +45,7 @@
 .Op Ar file
 .Sh DESCRIPTION
 The
-.Nm rwall
+.Nm
 command sends a message to the users logged into the specified host. The
 message to be sent can be typed in and terminated with EOF or it can
 be in a
@@ -56,14 +57,15 @@ The
 .Xr rpc.rwalld 8
 daemon has not been started on the remote host.
 .It rwall: RPC: Timed out
-A communication error occurred.  Either the network is
-excessively congested, or the
+A communication error occurred.
+Either the network is excessively congested, or the
 .Xr rpc.rwalld 8
 daemon has terminated on the remote host.
 .It rwall: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
 .Xr portmap 8 ),
-and cannot accommodate any RPC-based services.  The host may be down.
+and cannot accommodate any RPC-based services.
+The host may be down.
 .El
 .Sh SEE ALSO
 .Xr wall 1 ,
@@ -71,7 +73,7 @@ and cannot accommodate any RPC-based services.  The host may be down.
 .Xr rpc.rwalld 8
 .Sh HISTORY
 The
-.Nm rwall
+.Nm
 command
 appeared in
 .Tn SunOS .
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 882c0f11668..5e1517688ac 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: rwho.1,v 1.4 1999/06/05 01:21:39 aaron Exp $
+.\"	$OpenBSD: rwho.1,v 1.5 2000/03/10 20:17:51 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -43,22 +44,22 @@
 .Op Fl a
 .Sh DESCRIPTION
 The
-.Nm rwho
+.Nm
 command produces output similar to
 .Xr who 1 ,
 but for all machines on the local network.
 If no report has been
 received from a machine for 11 minutes then
-.Nm rwho
+.Nm
 assumes the machine is down, and does not report users last known
 to be logged into that machine.
 .Pp
 If a user hasn't typed to the system for a minute or more, then
-.Nm rwho
-reports this idle time.  If a user hasn't typed to the system for
-an hour or more, then
-the user will be omitted from the output of
-.Nm rwho
+.Nm
+reports this idle time.
+If a user hasn't typed to the system for an hour or more,
+then the user will be omitted from the output of
+.Nm
 unless the
 .Fl a
 flag is given.
@@ -76,7 +77,7 @@ information about other machines
 .Xr rwhod 8
 .Sh HISTORY
 The
-.Nm rwho
+.Nm
 command
 appeared in
 .Bx 4.3 .
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 99a6b24188a..cebfcdbe92f 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: script.1,v 1.5 2000/03/06 13:12:49 aaron Exp $
+.\"	$OpenBSD: script.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
 .\"	$NetBSD: script.1,v 1.3 1994/12/21 08:55:41 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -59,7 +59,7 @@ is given,
 saves all dialogue in
 .Ar file .
 If no file name is given, the typescript is saved in the file
-.Pa typescript  .
+.Pa typescript .
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 8152ca5ea42..4adaec6da28 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: sed.1,v 1.11 2000/03/06 03:17:39 aaron Exp $
+.\"	$OpenBSD: sed.1,v 1.12 2000/03/10 20:17:52 aaron Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 4595128e1f2..cc517dada7e 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shar.1,v 1.5 2000/03/06 03:17:39 aaron Exp $
+.\"	$OpenBSD: shar.1,v 1.6 2000/03/10 20:17:52 aaron Exp $
 .\"	$NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -55,12 +55,12 @@ utility does this correctly).
 .Pp
 .Nm shar
 is normally used for distributing files by
-.Xr ftp  1
+.Xr ftp 1
 or
-.Xr mail  1  .
+.Xr mail 1 .
 .Sh EXAMPLES
 To create a shell archive of the program
-.Xr ls  1
+.Xr ls 1
 and mail it to Rick:
 .Bd -literal -offset indent
 cd ls
@@ -96,7 +96,7 @@ It is easy to insert trojan horses into
 files.
 It is strongly recommended that all shell archive files be examined
 before running them through
-.Xr sh  1  .
+.Xr sh 1 .
 Archives produced using this implementation of
 .Nm shar
 may be easily examined with the command:
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 3a42d73d60f..df42b2039c6 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: showmount.8,v 1.7 2000/03/06 03:17:39 aaron Exp $
+.\"	$OpenBSD: showmount.8,v 1.8 2000/03/10 20:17:52 aaron Exp $
 .\"	$NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -48,7 +48,7 @@
 .Op Fl ade3
 .Op Ar host
 .Sh DESCRIPTION
-.Nm showmount
+.Nm
 shows status information about the
 .Tn NFS
 server on
@@ -84,7 +84,7 @@ Use mount protocol Version 3, compatible with NFS Version 3.
 .Xr mountd 8
 .Sh HISTORY
 The
-.Nm showmount
+.Nm
 utility first appeared in
 .Bx 4.4 .
 .Sh BUGS
@@ -92,6 +92,6 @@ The mount daemon running on the server only has an idea of the actual mounts,
 since the
 .Tn NFS
 server is stateless.
-.Nm showmount
+.Nm
 will only display the information
 as accurately as the mount daemon reports it.
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index 06ab8371b0f..adc65213c68 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: size.1,v 1.6 1999/06/05 01:21:40 aaron Exp $
+.\"	$OpenBSD: size.1,v 1.7 2000/03/10 20:17:52 aaron Exp $
 .\"	$NetBSD: size.1,v 1.6 1996/01/14 23:07:11 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -60,6 +60,8 @@ is specified
 .Nm
 attempts to report on the file
 .Pa a.out .
+.Pp
+The options are as follows:
 .Bl -tag -width flag
 .It Fl t
 At the end of the output print a total of the
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index e107c7ad1ab..27b55917a5c 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skey.1,v 1.18 1999/08/17 16:34:51 millert Exp $
+.\" $OpenBSD: skey.1,v 1.19 2000/03/10 20:17:52 aaron Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
 .Dd October 28, 1993
@@ -47,16 +47,19 @@ Password sequence numbers count backwards.
 You can enter the passwords using small letters, even though
 .Nm skey
 prints them capitalized.
-.Sh OPTIONS
+.Pp
+The options are as follows:
 .Bl -tag -width XXXXXXX
 .It Fl n Ar count
 Prints out
 .Ar count
-one-time passwords.  The default is to print one.
+one-time passwords.
+The default is to print one.
 .It Fl p Ar password
 Uses
 .Ar password
-as the secret password.  Use of this option is discouraged as
+as the secret password.
+Use of this option is discouraged as
 your secret password could be visible in a process listing.
 .It Fl x
 Causes output to be in hexadecimal instead of ASCII.
@@ -69,7 +72,7 @@ Selects SHA-1 (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
 .It Fl rmd160
 Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 .sp 0
     % skey 99 th91334
 .sp 0