MFC: recent mdoc(7) fixes.

62 files changed, 311 insertions, 223 deletions

diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 4834e7a134d9..fd116445a819 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -45,39 +45,39 @@
 .Nm
 .Fl d
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl \&Tv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl m
 .Op Fl abiTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar
 .Nm
 .Fl q
 .Op Fl cTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl cuTv
-.Ar archive file ...
+.Ar archive Ar
 .Nm
 .Fl r
 .Op Fl abciuTv
-.Ar position archive file ...
+.Ar position archive Ar
 .Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar
 .Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 2e4ea05bb12b..fd116445a819 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -37,49 +37,50 @@
 .\"
 .Dd June 29, 1993
 .Dt AR 1
+.Os
 .Sh NAME
 .Nm ar
 .Nd create and maintain library archives
 .Sh SYNOPSIS
-.Nm ar
+.Nm
 .Fl d
 .Op Fl \&Tv
-.Ar archive file ...
-.Nm ar
+.Ar archive Ar
+.Nm
 .Fl m
 .Op Fl \&Tv
-.Ar archive file ...
-.Nm ar
+.Ar archive Ar
+.Nm
 .Fl m
 .Op Fl abiTv
-.Ar position archive file ...
-.Nm ar
+.Ar position archive Ar
+.Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar
+.Nm
 .Fl q
 .Op Fl cTv
-.Ar archive file ...
-.Nm ar
+.Ar archive Ar
+.Nm
 .Fl r
 .Op Fl cuTv
-.Ar archive file ...
-.Nm ar
+.Ar archive Ar
+.Nm
 .Fl r
 .Op Fl abciuTv
-.Ar position archive file ...
-.Nm ar
+.Ar position archive Ar
+.Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar
+.Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar
 .Sh DESCRIPTION
 The
-.Nm ar
+.Nm
 utility creates and maintains groups of files combined into an archive.
 Once an archive has been created, new files can be added and existing
 files can be extracted, deleted, or replaced.
@@ -98,7 +99,7 @@ on the command line to ``select'' archive files for an operation, only the
 file with a matching name will be selected.
 .Pp
 The normal use of
-.Nm ar
+.Nm
 is for the creation and maintenance of libraries suitable for use with
 the loader (see
 .Xr ld 1 )
@@ -131,7 +132,7 @@ is written to standard error.
 If the
 .Fl c
 option is specified,
-.Nm ar
+.Nm
 creates the archive silently.
 .It Fl d
 Delete the specified archive files.
@@ -218,14 +219,14 @@ When used with the
 or
 .Fl x
 options,
-.Nm ar
+.Nm
 gives a file-by-file description of the archive modification.
 This description consists of three, white-space separated fields: the
 option letter, a dash (``-'') and the file name.
 When used with the
 .Fl r
 option,
-.Nm ar
+.Nm
 displays the description as above, but the initial letter is an ``a'' if
 the file is added to the archive and an ``r'' if the file replaces a file
 already in the archive.
@@ -243,7 +244,7 @@ followed by two newline characters.
 When used with the
 .Fl t
 option,
-.Nm ar
+.Nm
 displays an ``ls -l'' style listing of information about the members of
 the archive.
 This listing consists of eight, white-space separated fields:
@@ -271,7 +272,7 @@ extracted file or the super-user.
 .El
 .Pp
 The
-.Nm ar
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
@@ -287,14 +288,14 @@ temporary file names
 .El
 .Sh COMPATIBILITY
 By default,
-.Nm ar
+.Nm
 writes archives that may be incompatible with historic archives, as
 the format used for storing archive members with names longer than
 fifteen characters has changed.
 This implementation of
-.Nm ar
+.Nm
 is backward compatible with previous versions of
-.Nm ar
+.Nm
 in that it can read and write (using the
 .Fl T
 option) historic archives.
@@ -307,7 +308,7 @@ See
 for more information.
 .Sh STANDARDS
 The
-.Nm ar
+.Nm
 utility is expected to offer a superset of the
 .St -p1003.2
 functionality.
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 7a8e2c552f3c..31a645ebdd1b 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -108,11 +108,11 @@ and to run the job tomorrow by suffixing the time with
 .Em tomorrow .
 .Pp
 For example, to run a job at 4pm three days from now, you would do
-.Nm at 4pm + 3 days ,
+.Nm at Ar 4pm + 3 days ,
 to run a job at 10:00am on July 31, you would do
-.Nm at 10am Jul 31
+.Nm at Ar 10am Jul 31
 and to run a job at 1am tomorrow, you would do
-.Nm at 1am tomorrow.
+.Nm at Ar 1am tomorrow .
 .Pp
 For both
 .Nm
@@ -156,7 +156,7 @@ and
 If the file
 .Pa _PERM_PATH/at.allow
 exists, only usernames mentioned in it are allowed to use
-.Nm Ns .
+.Nm .
 .Pp
 If
 .Pa _PERM_PATH/at.allow
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 06b76e6bfa59..23f3f7a0ad89 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -93,4 +93,6 @@ The
 .Nm
 and
 .Nm dirname
-functions are expected to be POSIX 1003.2 compatible.
+functions are expected to be
+.St -p1003.2
+compatible.
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 5975902980fa..889efc75d188 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -167,7 +167,7 @@ This field may be filled in with either a number or a group name (see
 The
 .Ar class
 field references class descriptions in
-.Ar /etc/login.conf
+.Pa /etc/login.conf
 and is typically used to initialize the user's system resource limits
 when they login.
 .Pp
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 922f16c71077..90d124591671 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -132,7 +132,7 @@ Mathematically, the
 .Tn CRC
 value corresponding to a given file is defined by
 the following procedure:
-.Bd -filled -offset indent
+.Bd -ragged -offset indent
 The
 .Ar n
 bits to be evaluated are considered to be the coefficients of a mod 2
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 1cf12cc4a1ea..35212cac6475 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -69,11 +69,11 @@ usable by system commands and routines.
 .Pp
 Options list:
 .Bl -tag -width 4n
-.It Cm Fl I Ar map_dir
+.It Fl I Ar map_dir
 This option set directory name where
 .Ar charmap
 files can be found, current directory by default.
-.It Cm Fl o Ar out_file
+.It Fl o Ar out_file
 This option set output file name,
 .Ar LC_COLLATE
 by default.
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 1fbfe71af266..3d0e158865a9 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -63,7 +63,7 @@ and lines in both files.
 The filename ``-'' means the standard input.
 .Pp
 The following options are available:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl 1
 Suppress printing of column 1.
 .It Fl 2
@@ -84,8 +84,9 @@ printed in column number three will have one.
 assumes that the files are lexically sorted; all characters
 participate in line comparisons.
 .Sh DIAGNOSTICS
-.Nm Comm
-exits 0 on success, >0 if an error occurred.
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr cmp 1 ,
 .Xr diff 1 ,
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 712e0cd03356..61efca3c68ba 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -86,7 +86,7 @@ It is not an error to select fields or columns not present in the
 input line.
 .Pp
 The options are as follows:
-.Bl -tag -width Fl
+.Bl -tag -width indent
 .It Fl b Ar list
 The 
 .Ar list
@@ -107,7 +107,7 @@ Output fields are separated by a single tab character.
 .It Fl n
 Do not split multi-byte characters.
 .It Fl s
-Suppresses lines with no field delimiter characters.
+Suppress lines with no field delimiter characters.
 Unless specified, lines with no delimiters are passed through unmodified.
 .El
 .Pp
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index aacba0158b62..3cfab686ba31 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -49,7 +49,7 @@
 .Xc
 .Fl S Ar int
 .Fl U Ar int
-.Op Ar cmd [args ...]
+.Op Ar cmd Op Ar args ...
 .Sh DESCRIPTION
 .Nm Doscmd
 can either emulate a subset of DOS and run the
@@ -547,9 +547,9 @@ file names by converting to all upper case and eliminating any invalid
 character.  It does not make any attempt to convert ASCII files into
 the
 .Cm <CR><LF>
-format favored in the DOS world.  Use the program
-.Xr bsd2dos 1
-to convert ASCII files.
+format favored in the DOS world.  Use
+.Xr fconv 1
+(part of the ports collection) or similar tools to convert ASCII files.
 .bp
 .Sh DISK TYPES
 .TS H
@@ -659,7 +659,7 @@ and has the commands fdisk, format and sys on it.  You should also
 copy the file redir.com onto the floppy by either mounting it
 with the msdos file system type or by using mtools
 (e.g.,
-.Li mwrite redir.com a: ).
+.Dq Li mwrite redir.com a: ) .
 .It 3
 run doscmd.
 .It 4
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 4d76028aff54..956e87918f34 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -267,7 +267,7 @@ Display a help screen, with all of the keyboard operations and commands.
 Pop up a menu for selecting whether to read a file, write to a file, or 
 save the current contents of the editor, as well as send the contents of 
 the editor to a print command (see the section
-.Sx "Initializing ee from a file" Ns ).
+.Sx "Initializing ee from a file" ) .
 .It redraw screen
 Provide a means to repaint the screen if the screen has been corrupted.
 .It settings
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index ddd5f3f5088d..93c62b116cdb 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -42,7 +42,12 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Ns Ar tabstop
-.Op Fl t Ar tab1,tab2,...,tabn
+.Oo
+.Fl t
+.Sm off
+.Ar tab1 , tab2 , ... , tabn
+.Sm on
+.Oc
 .Op Ar
 .Nm unexpand
 .Op Fl a
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 2158decd7468..3a3548bff347 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -165,7 +165,7 @@ ignored and the file is fetched unconditionally.
 Print the size in bytes of each requested file, without fetching it.
 .It Fl T Ar seconds
 Set timeout value to
-.Ar seconds.
+.Ar seconds .
 Overrides the environment variables
 .Ev FTP_TIMEOUT
 for FTP transfers or
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 99d6211769f8..0bc045066187 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -297,7 +297,7 @@ If your old
 command uses a magic file,
 keep the old magic file around for comparison purposes
 (rename it to 
-.Pa /usr/share/misc/magic.orig Ns ).
+.Pa /usr/share/misc/magic.orig ) .
 .Sh EXAMPLES
 .Bd -literal
 $ file file.c file /dev/hda
@@ -459,7 +459,7 @@ as first 5 chars of file) because they are not
 as good as other guesses (e.g.
 .Dq Newsgroups:
 versus
-.Dq Return-Path: Ns ).
+.Dq Return-Path: ) .
 Still, if the others don't pan out, it
 should be possible to use the first guess.
 .Pp
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index cf6b02ed0993..9afcfab4a69c 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -202,9 +202,9 @@ if one is not specified is long.
 Sometimes you do not know the exact offset as this depends on the length of
 preceding fields.
 You can specify an offset relative to the end of the
-last uplevel field (of course this may only be done for sublevel tests, i.e.
+last uplevel field (of course this may only be done for sublevel tests, i.e.\&
 test beginning with 
-.Em > Ns ).
+.Em > Ns ) .
 Such a relative offset is specified using
 .Em &
 as a prefix to the offset.
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 818ac404d60b..10bf481871c3 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -332,8 +332,7 @@ Like
 but the match is case insensitive.
 .It Xo
 .Ic -perm
-.Op Fl
-.Ar mode
+.Oo Fl Oc Ns Ar mode
 .Xc
 The
 .Ar mode
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index 8d16d6e7ef59..9cf6ee79e746 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -9,7 +9,7 @@
 .Nd generate linker set definitions
 .Sh SYNOPSIS
 .Nm
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index bef33022b564..acfda05d8617 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -42,7 +42,7 @@
 .Nm
 .Op Fl n Ar count
 .Op Fl c Ar bytes
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 This filter displays the first
 .Ar count
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1a67e5aa9d16..b5c5c9dd7ae6 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -47,7 +47,7 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file  ...
+.Ar
 .Nm hd
 .Op Fl bcdovx
 .Op Fl e Ar format_string
@@ -56,7 +56,7 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file  ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
@@ -77,7 +77,7 @@ Display the input offset in hexadecimal, followed by sixteen
 space-separated, three column, space-filled, characters of input
 data per line.
 .It Fl C
-.Em Canonical hex+ASCII display.
+.Em Canonical hex+ASCII display .
 Display the input offset in hexadecimal, followed by sixteen
 space-separated, two column, hexadecimal bytes, followed by the
 same sixteen bytes in %_p format enclosed in ``|'' characters.
@@ -86,7 +86,7 @@ Calling the command
 .Nm hd
 implies this option.
 .It Fl d
-.Em Two-byte decimal display.
+.Em Two-byte decimal display .
 Display the input offset in hexadecimal, followed by eight
 space-separated, five column, zero-filled, two-byte units
 of input data, in unsigned decimal, per line.
@@ -102,7 +102,7 @@ Interpret only
 .Ar length
 bytes of input.
 .It Fl o
-.Em Two-byte octal display.
+.Em Two-byte octal display .
 Display the input offset in hexadecimal, followed by eight
 space-separated, six column, zero-filled, two byte quantities of
 input data, in octal, per line.
@@ -149,7 +149,7 @@ identical to the immediately preceding group of output lines (except
 for the input offsets), are replaced with a line comprised of a
 single asterisk.
 .It Fl x
-.Em Two-byte hexadecimal display.
+.Em Two-byte hexadecimal display .
 Display the input offset in hexadecimal, followed by eight, space
 separated, four column, zero-filled, two-byte quantities of input
 data, in hexadecimal, per line.
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 29a18f0cbc19..f7529c88790d 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -76,7 +76,6 @@ from the system.
 .Pp
 The identifiers and keys associated with these System V IPC objects can be
 determined by using
-.Xr ipcs 1
-.
+.Xr ipcs 1 .
 .Sh SEE ALSO
 .Xr ipcs 1
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index 2b3545c6403b..1e4988663b44 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -14,11 +14,18 @@
 .Ar key 
 .Sh DESCRIPTION
 .Nm Key
-takes the optional count  of the number of one time access 
+takes the optional count of the number of one time access 
 passwords to print
-along with a (maximum) sequence number and key as command line args, 
+along with a (maximum) sequence number and key as command line arguments, 
 it prompts for the user's secret password, and produces both word 
 and hex format responses.
+.Pp
+The following option is available:
+.Bl -tag -width Fl
+.It Fl n Ar count
+The number of one time access passwords to print.
+The default is 1.
+.El
 .Sh EXAMPLES
 Usage example:
 .Bd -literal -offset indent -compact
@@ -28,18 +35,13 @@ OMEN US HORN OMIT BACK AHOY
 \&.... 4 more passwords.
 >
 .Ed
-.Sh OPTIONS
-.Bl -tag -width Fl
-.It Fl n Ar count
-The number of one time access passwords to print.
-The default is one.
-.El
 .Sh SEE ALSO
 .Xr keyinfo 1 ,
 .Xr keyinit 1 ,
 .Xr skey 1
 .\" .BR keysu(1),
 .Sh AUTHORS
+.An -nosplit
 Command by
 .An Phil Karn ,
 .An Neil M. Haller ,
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 0dd6e61bffb4..bfba8817c8d7 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -90,7 +90,7 @@ or numerically.
 Limit potentially matching processes to those belonging to
 the specified
 .Ar user .
-.It Fl c Ar tty
+.It Fl t Ar tty
 Limit potentially matching processes to those running on 
 the specified
 .Ar tty .
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 942edca14772..45af885e4765 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -40,15 +40,15 @@
 .Nd laminate files
 .Sh SYNOPSIS
 .Nm
-.Op Fl f Ar min.max
+.Op Fl f Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
-.Ar file ...
+.Ar
 .Nm
-.Op Fl p Ar min.max
+.Op Fl p Ar min . Ns Ar max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Lam
 copies the named files side by side onto the standard output.
@@ -68,9 +68,9 @@ If the option letter is capitalized it affects all subsequent files
 until it appears again uncapitalized.
 The options are described below.
 .Bl -tag -width indent
-.It Fl f Ar min.max
+.It Fl f Ar min . Ns Ar max
 Print line fragments according to the format string
-.Ar min.max ,
+.Ar min . Ns Ar max ,
 where
 .Ar min
 is the minimum field width and
@@ -81,7 +81,7 @@ If
 begins with a zero, zeros will be added to make up the field width,
 and if it begins with a `\-', the fragment will be left-adjusted
 within the field.
-.It Fl p Ar min.max
+.It Fl p Ar min . Ns Ar max
 Like
 .Fl f ,
 but pad this file's field when end-of-file is reached
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index e32708ef8fc7..389a6487d92f 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -40,12 +40,7 @@
 .Nd remind you when you have to leave
 .Sh SYNOPSIS
 .Nm
-.Sm off
-.Oo
-.Op Cm \&+
-.Ns Ar hhmm
-.Oc
-.Sm on
+.Op Oo Cm \&+ Oc Ns Ar hhmm
 .Sh DESCRIPTION
 .Nm Leave
 waits until the specified time, then reminds you that you
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index cb13e2a051be..261a10a31861 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -36,7 +36,7 @@
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
 .Op Fl E
-.Op Ar name=value ...
+.Op Ar name Ns = Ns Ar value ...
 .Op Ar command
 .Nm
 .Op Fl U Ar user
@@ -48,7 +48,7 @@
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
 .Op Fl E
-.Op Ar name=value ...
+.Op Ar name Ns = Ns Ar value ...
 .Op Ar command
 .Sh DESCRIPTION
 .Nm Limits
@@ -60,20 +60,22 @@ Three uses of the
 .Nm
 command are possible:
 .Pp
-.Bl -hang -width indent
-.It Nm
+.Bl -tag -width indent
+.It Xo
+.Nm
 .Op Ar limitflags
-.Op Ar name=value
+.Op Ar name Ns = Ns Ar value
 .Ar command
-.Pp
+.Xc
 This usage sets limits according to
 .Ar limitflags ,
 optionally sets environment variables given as
-.Ar name=value
+.Ar name Ns = Ns Ar value
 pairs, and then runs the specified command.
-.It Nm
+.It Xo
+.Nm
 .Op Ar limitflags
-.Pp
+.Xc
 This usage determines values of resource settings according to
 .Ar limitflags ,
 does not attempt to set them and outputs these values to
@@ -89,9 +91,10 @@ by the the appropriate login class resource limit entries from
 the
 .Xr login.conf 5
 login capabilities database.
-.It Nm
+.It Xo
+.Nm
 .Fl e Op Ar limitflags
-.Pp
+.Xc
 This usage determines values of resource settings according to
 .Ar limitflags ,
 but does not set them itself.
@@ -109,7 +112,7 @@ emits 'limit' or 'ulimit' commands in the format understood by
 that shell.
 If the name of the shell cannot be determined, then the 'ulimit'
 format used by
-.Pa /bin/sh
+.Xr sh 1
 is used.
 .Pp
 This is very useful for setting limits used by scripts, or prior
@@ -328,7 +331,7 @@ filesystem must be installed
 and mounted for the shell to be correctly determined, and therefore
 output syntax correct for the running shell.
 The default output is valid for
-.Pa /bin/sh ,
+.Xr sh 1 ,
 so this means that any
 usage of
 .Nm
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index ed688b467f37..e87678ed366a 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -43,7 +43,7 @@
 .Op Fl df
 .Op Fl t Ar termchar
 .Ar string
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The 
 .Nm
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 2f63da090911..bd0e7fe3f427 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -45,7 +45,10 @@
 .Op Fl c Ar cc-addr
 .Op Fl b Ar bcc-addr
 .Ar to-addr ...
-.Op \&- Ar sendmail-option ...
+.Oo
+.Fl
+.Ar sendmail-option ...
+.Oc
 .Nm
 .Op Fl iInNv
 .Fl f
@@ -316,7 +319,7 @@ the current message, the search proceeds backwards, and if there are no
 good messages at all,
 .Nm
 types
-.Dq Li No applicable messages
+.Dq Li \&No applicable messages
 and
 aborts the command.
 .Bl -tag -width delete
@@ -419,7 +422,7 @@ Takes a list of messages and points the text editor at each one in
 turn.
 On return from the editor, the message is read back in.
 .It Ic exit
-.Pf ( Ic ex
+.Ic ( ex
 or
 .Ic x )
 Effects an immediate return to the Shell without
@@ -469,7 +472,7 @@ argument is given, the previous 18\-message group is printed.
 A synonym for
 .Ic \&?
 .It Ic hold
-.Pf ( Ic ho ,
+.Ic ( ho ,
 also
 .Ic preserve )
 Takes a message list and marks each
@@ -952,7 +955,7 @@ If set, will be used to initialize the Reply-To field for outgoing
 messages.
 .It Ev SHELL
 Pathname of the shell to use in the
-.Ic \&!
+.Ic !\&
 command and the
 .Ic \&~!
 escape.
@@ -1025,9 +1028,9 @@ default in /var/mail.
 .Bl -tag -width /usr/share/misc/mail.*help -compact
 .It Pa /var/mail/*
 Post office.
-.It ~/mbox
+.It Pa ~/mbox
 User's old mail.
-.It ~/.mailrc
+.It Pa ~/.mailrc
 File giving initial mail commands.
 .It Pa /tmp/R*
 Temporary files.
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 40f0f56ccdf9..68dccd7cdcfd 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -941,20 +941,13 @@ is found.
 .Pp
 For loops are typically used to apply a set of rules to a list of files.
 The syntax of a for loop is:
-.Bl -tag -width Ds
-.It Xo
-.Ic \&.for
-.Ar variable
-.Ic in
-.Ar expression
-.Xc
-.It Xo
-<make-rules>
-.Xc
-.It Xo
-.Ic \&.endfor
-.Xc
+.Pp
+.Bl -tag -width indent -compact
+.It Ic .for Ar variable Ic in Ar expression
+.It <make-rules>
+.It Ic \&.endfor
 .El
+.Pp
 After the for
 .Ar expression
 is evaluated, it is split into words.
@@ -1064,7 +1057,7 @@ any suffix so declared will have the directories on its search path (see
 .Ic .PATH )
 placed in the
 .Va .INCLUDES
-special variable, each preceeded by a
+special variable, each preceded by a
 .Fl I
 flag.
 .It Ic .INTERRUPT
@@ -1244,6 +1237,8 @@ won't work, and should be rewritten the other way around.
 .Rs
 .%T "PMake - A Tutorial"
 .Re
+in
+.Pa /usr/share/doc/psd/12.make
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index fad6fa6d6ccc..02f347d9ec5b 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -33,7 +33,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl d
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 .Nm Minigzip
 is a minimal implementation of the
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index c26d244add73..024c6854a4c0 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -43,7 +43,7 @@
 .Op Fl ap
 .Op Fl f Ar file
 .Op Ar flags
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Mkdep
 takes a set of flags for the C compiler and a list
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index e221609fe5e9..de2a86fbe5a6 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -59,7 +59,7 @@ utility reads a
 source file from standard input and produces a
 .Dv LC_CTYPE
 binary file on standard output suitable for placement in
-.Dv /usr/share/locale/\fIlanguage\fP/LC_CTYPE.
+.Pa /usr/share/locale/ Ns Ar language Ns Pa /LC_CTYPE .
 .Pp
 The format of
 .Ar src-file
@@ -189,12 +189,12 @@ through
 Defines the tolower mappings.
 .Dv RUNE2
 is the lower case representation of
-.Dv RUNE1.
+.Dv RUNE1 .
 .It Dv MAPUPPER
 Defines the toupper mappings.
 .Dv RUNE2
 is the upper case representation of
-.Dv RUNE1.
+.Dv RUNE1 .
 .It Dv TODIGIT
 Defines a map from runes to their digit value.
 .Dv RUNE2
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index c13fd49c7d77..c656630240c1 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -42,7 +42,7 @@
 .Nm
 .Op Fl
 .Ar messagefile
-.Ar prefix file ...
+.Ar prefix Ar
 .Sh DESCRIPTION
 .Nm Mkstr
 creates files containing error messages extracted from C source,
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index eba6a08a8dcf..9a0140235b0b 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,6 +1,3 @@
-.\" $FreeBSD$
-.\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
-.\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -32,6 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\" $FreeBSD$
 .\"
 .Dd November 20, 1996
@@ -144,11 +142,11 @@ exits.  This is slightly better than
 but still introduces a race condition.  Use of this
 option is not encouraged.
 .El
-.Sh RETURN VALUES
+.Sh DIAGNOSTICS
 The
 .Nm
 utility
-exits with a value of 0 on success, and 1 on any failure.
+exits 0 on success, and 1 if an error occurs.
 .Sh EXAMPLES
 The following
 .Xr sh 1
@@ -157,19 +155,22 @@ fragment illustrates a simple use of
 where the script should quit if it cannot get a safe
 temporary file.
 .Bd -literal -offset indent
-TMPFILE=`mktemp /tmp/$0.XXXXXX` || exit 1
+tempfoo=`basename $0`
+TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1
 echo "program output" >> $TMPFILE
 .Ed
 .Pp
 To allow the use of $TMPDIR:
 .Bd -literal -offset indent
-TMPFILE=`mktemp -t $0` || exit 1
+tempfoo=`basename $0`
+TMPFILE=`mktemp -t ${tempfoo}` || exit 1
 echo "program output" >> $TMPFILE
 .Ed
 .Pp
 In this case, we want the script to catch the error itself.
 .Bd -literal -offset indent
-TMPFILE=`mktemp -q /tmp/$0.XXXXXX`
+tempfoo=`basename $0`
+TMPFILE=`mktemp -q /tmp/${tempfoo}.XXXXXX`
 if [ $? -ne 0 ]; then
 	echo "$0: Can't create temp file, exiting..."
 	exit 1
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 189936cb8c65..bf5c28dba586 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -214,7 +214,7 @@ terminal type.
 .Bl -tag -width /var/msgs/* -compact
 .It Pa /var/msgs/*
 database
-.It ~/.msgsrc
+.It Pa ~/.msgsrc
 number of next message to be presented
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index d07b1ffa3760..1c60600ad565 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -74,7 +74,8 @@ The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
 Specify the name of the
-.Tn NetWare server to connect to.
+.Tn NetWare
+server to connect to.
 This affect only
 .Tn IPX
 servers.
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index 62d2312fda7d..590a305cc49e 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -51,6 +51,6 @@ utility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 .An Boris Popov Aq bp@butya.kz ,
-.Aq bp@freebsd.org
+.Aq bp@FreeBSD.org
 .Sh BUGS
 Please report any bugs to the author.
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 879017250894..2f4a02dd79d3 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -173,7 +173,7 @@ option is present, show per-interface statistics on the
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl i
 Show the state of interfaces which have been auto-configured
@@ -195,7 +195,7 @@ option is present, show per-interface statistics on all interfaces
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl L
 Show the size of the various listen queues.
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index d6a52d22b42e..3179ad2c38a7 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -44,7 +44,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The symbol table (name list) of each object in
-.Ar file(s)
+.Ar file Ns (s)
 is displayed.
 If a library (archive) is given,
 .Nm 
@@ -114,6 +114,33 @@ warn if next symbol is referenced
 .Pp
 If the symbol is local (non-external) the type letter is in lower case.
 The output is sorted alphabetically.
+.Sh KEYWORDS
+The following is a complete list of keywords and their meaning.
+The keyword is uppercase for external, lowercase for internal symbols.
+Only uppercase keywords are shown here.
+.Pp
+.Bl -tag -width sigignore -compact
+.It A
+Absolute Address
+.It B
+BSS Segment
+.It C
+Common Reference
+.It D
+Data Segment
+.It F
+Filename (external only)
+.It w
+Warning refs (internal only)
+.It I
+Alias definition
+.It T
+Text Segment
+.It U
+Undefined
+.It ?
+None of the above
+.El
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr a.out 5 ,
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index d6a52d22b42e..3179ad2c38a7 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -44,7 +44,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The symbol table (name list) of each object in
-.Ar file(s)
+.Ar file Ns (s)
 is displayed.
 If a library (archive) is given,
 .Nm 
@@ -114,6 +114,33 @@ warn if next symbol is referenced
 .Pp
 If the symbol is local (non-external) the type letter is in lower case.
 The output is sorted alphabetically.
+.Sh KEYWORDS
+The following is a complete list of keywords and their meaning.
+The keyword is uppercase for external, lowercase for internal symbols.
+Only uppercase keywords are shown here.
+.Pp
+.Bl -tag -width sigignore -compact
+.It A
+Absolute Address
+.It B
+BSS Segment
+.It C
+Common Reference
+.It D
+Data Segment
+.It F
+Filename (external only)
+.It w
+Warning refs (internal only)
+.It I
+Alias definition
+.It T
+Text Segment
+.It U
+Undefined
+.It ?
+None of the above
+.El
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr a.out 5 ,
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 5225ccf0a0a8..fef232b411a8 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -46,7 +46,7 @@
 .Nm
 .Op Fl s
 .Op Fl d Ar list
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f2fe69385e6a..01f36a2e8ba9 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -94,7 +94,7 @@
 .Op Fl w Ar width
 .Ek
 .Op -
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
@@ -163,7 +163,10 @@ An extra
 character is output following every
 .Em <newline>
 found in the input.
-.It Fl e Ar \&[char\&]\&[gap\&]
+.It Fl e Xo
+.Op Ar char Ns
+.Op Ar gap
+.Xc
 Expand each input
 .Em <tab>
 to the next greater column
@@ -197,7 +200,10 @@ Use the string
 to replace the
 .Ar file name
 in the header line.
-.It Fl i Ar \&[char\&]\&[gap\&]
+.It Fl i Xo
+.Op Ar char Ns
+.Op Ar gap
+.Xc
 In output, replace multiple
 .Em <space>s
 with
@@ -250,7 +256,10 @@ The options
 and
 .Fl i
 are assumed.
-.It Fl n Ar \&[char\&]\&[width\&]
+.It Fl n Xo
+.Op Ar char Ns
+.Op Ar width
+.Xc
 Provide
 .Ar width
 digit line numbering.
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 177baf592ca6..cac26f8b04ed 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl t
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Ranlib
 creates a table of external references for archive libraries,
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index d57cf9836a42..cac26f8b04ed 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl t
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 .Nm Ranlib
 creates a table of external references for archive libraries,
@@ -55,7 +55,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl t
 Set the modification time of the __.SYMDEF file.
-Some loaders (but not the FreeBSD one)
+Some loaders (but not the
+.Fx
+one)
 compared this time with the modification time of the
 archive to verify that the table is up-to-date with respect to the
 archive.
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index d8775c14b2f7..68b00bf89c53 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -40,7 +40,7 @@
 .Nd reverse lines of a file
 .Sh SYNOPSIS
 .Nm
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 8f44832e34d5..e8a705d4008f 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -214,16 +214,14 @@ Determines the user's terminal type.
 .Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
-.Xr rshd 8 .
+.Xr rshd 8
 .Sh FILES
 .Bl -tag -width /etc/hosts -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/auth.conf
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.It Pa Ev $HOME /.klogin
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
+.It Ev $HOME Ns Pa /.klogin
 .El
 .Sh HISTORY
 The
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 12f91d949da2..59830ffbd468 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -155,7 +155,7 @@ to
 .Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
-.Xr rshd 8 .
+.Xr rshd 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 4edae6add359..becc2412e146 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -45,12 +45,12 @@
 .Nm
 .Op Fl Ean
 .Ar command
-.Op Ar file ...
+.Op Ar
 .Nm
 .Op Fl Ean
 .Op Fl e Ar command
 .Op Fl f Ar command_file
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index c12234730f11..631e62427d9b 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -107,7 +107,7 @@ The default naming convention allows 2028 separate files.
 .Pp
 The maximum line length for matching patterns is 65536.
 .Sh SEE ALSO
-.Xr re_format 7 .
+.Xr re_format 7
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 4aa89f2f6ed2..146bfa9d8fc7 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -464,14 +464,20 @@ Display only the specified drives.  Multiple drives may be specified,
 separated by spaces.
 .It Cm drives
 Display a list of available devices.
-.It Cm match Ar type,if,pass Op Ar | ...
+.It Cm match Xo
+.Ar type , Ns Ar if , Ns Ar pass
+.Op | Ar ...
+.Xc
 Display devivces matching the given pattern.  The basic matching
 expressions are the same as those used in
 .Xr iostat 8
 with one difference.  Instead of specifying multiple
 .Fl t
 arguments which are then ORed together, the user instead specifys multiple
-matching expressions joined by the pipe ( | ) character.  The comma
+matching expressions joined by the pipe
+.Pq Ql \&|
+character.
+The comma
 separated arguments within each matching expression are ANDed together, and
 then the pipe separated matching expressions are ORed together.  Any
 device matching the combined expression will be displayed, if there is room
@@ -490,6 +496,7 @@ and all passthrough devices that provide access to CDROM drives.
 .Xr iostat 8 ,
 .Xr netstat 1 ,
 .Xr vmstat 8 ,
+.Xr kvm 3 ,
 .Xr icmp 4 ,
 .Xr ip 4 ,
 .Xr tcp 4 ,
@@ -500,8 +507,6 @@ and all passthrough devices that provide access to CDROM drives.
 For the namelist.
 .It Pa /dev/kmem
 For information in main memory.
-.It Pa /dev/drum
-For information about swapped out processes.
 .It Pa /etc/hosts
 For host names.
 .It Pa /etc/networks
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index d5748d439d71..559ae71de093 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -75,7 +75,7 @@ with the
 option in the
 .Ev TERMINFO
 environment variable, and in
-.Pa /usr/lib/terminfo Ns ),
+.Pa /usr/lib/terminfo ) ,
 otherwise
 .Nm
 will look in all available databases.
@@ -154,7 +154,7 @@ The default filename of the termcap database.
 .Xr termcap 3 ,
 .Xr term 5 ,
 .Xr termcap 5 ,
-.Xr terminfo 5 .
+.Xr terminfo 5
 .Sh DIAGNOSTICS
 The line number of a warning message when translating a file
 may refer to the last line of an entry instead of the line in the entry 
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index b6e6b79a64f6..56bf05693b35 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -108,7 +108,7 @@ as an IP address.
 .It Fl S Ar tos
 Sets the IP type-of-service (TOS) option for the telnet
 connection to the value
-.Ar tos,
+.Ar tos ,
 which can be a numeric TOS value
 or, on systems that support it, a symbolic
 TOS name found in the
@@ -334,12 +334,12 @@ command are:
 .It Ic disable Ar type
 Disables the specified type of authentication.  To
 obtain a list of available types, use the
-.Ic auth disable \&?
+.Ic auth disable ?\&
 command.
 .It Ic enable Ar type
 Enables the specified type of authentication.  To
 obtain a list of available types, use the
-.Ic auth enable \&?
+.Ic auth enable ?\&
 command.
 .It Ic status
 Lists the current status of the various types of
@@ -368,18 +368,22 @@ Valid arguments for the
 .Ic encrypt
 command are:
 .Bl -tag -width Ar
-.It Ic disable Ar type Ic [input|output]
+.It Ic disable Ar type Xo
+.Op Cm input | output
+.Xc
 Disables the specified type of encryption.  If you
 omit the input and output, both input and output
 are disabled.  To obtain a list of available
 types, use the
-.Ic encrypt disable \&?
+.Ic encrypt disable ?\&
 command.
-.It Ic enable Ar type Ic [input|output]
+.It Ic enable Ar type Xo
+.Op Cm input | output
+.Xc
 Enables the specified type of encryption.  If you
 omit input and output, both input and output are
 enabled.  To obtain a list of available types, use the
-.Ic encrypt enable \&?
+.Ic encrypt enable ?\&
 command.
 .It Ic input
 This is the same as the
@@ -397,18 +401,18 @@ command.
 This is the same as the
 .Ic encrypt stop output
 command.
-.It Ic start Ic [input|output]
+.It Ic start Op Cm input | output
 Attempts to start encryption.  If you omit
 .Ic input
 and
-.Ic output,
+.Ic output ,
 both input and output are enabled.  To
 obtain a list of available types, use the
-.Ic encrypt enable \&?
+.Ic encrypt enable ?\&
 command.
 .It Ic status
 Lists the current status of encryption.
-.It Ic stop Ic [input|output]
+.It Ic stop Op Cm input | output
 Stops encryption.  If you omit input and output,
 encryption is on both input and output.
 .It Ic type Ar type
@@ -419,7 +423,7 @@ or
 .Ic encrypt stop
 commands.
 .El
-.It Ic environ Ar arguments... 
+.It Ic environ Ar arguments ...
 The
 .Ic environ
 command is used to manipulate the
@@ -448,7 +452,7 @@ command are:
 Define the variable
 .Ar variable
 to have a value of
-.Ar value.
+.Ar value .
 Any variables defined by this command are automatically exported.
 The
 .Ar value
@@ -473,7 +477,7 @@ Those marked with a
 .Cm *
 will be sent automatically,
 other variables will only be sent if explicitly requested.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic environ
 command.
@@ -553,7 +557,7 @@ option.
 This requires that the 
 .Dv LINEMODE
 option be enabled.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic mode
 command.
@@ -561,8 +565,7 @@ command.
 .It Xo
 .Ic open Ar host
 .Op Fl l Ar user
-.Oo Op Fl
-.Ar port Oc
+.Op Oo Fl Oc Ns Ar port
 .Xc
 Open a connection to the named host.
 If no port number
@@ -722,10 +725,10 @@ command.
 can also be either
 .Ic help
 or
-.Ic \&?
+.Ic ?\&
 to print out help information, including
 a list of known symbolic names.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic send
 command.
@@ -1029,7 +1032,7 @@ The initial value for the worderase character is taken to be
 the terminal's
 .Ic worderase
 character.
-.It Ic \&?
+.It Ic ?\&
 Displays the legal
 .Ic set
 .Pq Ic unset
@@ -1077,7 +1080,7 @@ The remote default characters are those of the remote system
 at the time when the 
 .Tn TELNET
 connection was established.
-.It Ic \&?
+.It Ic ?\&
 Prints out help information for the
 .Ic slc
 command.
@@ -1330,7 +1333,7 @@ skips the reading of the
 file in the users home
 directory when connections are opened.  The initial
 value for this toggle is
-.Dv FALSE.
+.Dv FALSE .
 .It Ic termdata
 Toggles the display of all terminal data (in hexadecimal format).
 The initial value for this toggle is
@@ -1343,10 +1346,10 @@ toggle is
 .Nm
 prints out a message each time encryption is enabled or
 disabled.  The initial value for this toggle is
-.Dv FALSE.
+.Dv FALSE .
 Note:  Because of export controls, data encryption
 is not supported outside of the United States and Canada.
-.It Ic \&?
+.It Ic ?\&
 Displays the legal
 .Ic toggle
 commands.
@@ -1362,7 +1365,7 @@ system.  If
 .Ar command
 is omitted, then an interactive
 subshell is invoked.
-.It Ic \&? Op Ar command 
+.It Ic ?\& Op Ar command 
 Get help.  With no arguments,
 .Nm
 prints a help summary.
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index f8c1dd4878bd..d77e38c2aff2 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -66,7 +66,7 @@ database.
 If the entry includes an "ACU" type capability (abbreviated at), 
 .Xr tip 1
 looks up the specified modem in 
-.Pa /etc/modems.
+.Pa /etc/modems .
 If a modem entry is found,
 the corresponding capabilities determine how 
 .Xr tip 1
@@ -115,7 +115,7 @@ issued to the modem.
 (bool)
 Use a fixed bit rate between the computer and the modem (DTE / DCE). The
 bit rate is specified in 
-.Pa /etc/remote.
+.Pa /etc/remote .
 .It Cm \&reset_command
 (str)
 AT command to reset the modem.
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 21191e198ed0..355fab5cd63d 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -424,15 +424,15 @@ Global modem configuration data base.
 Global system descriptions.
 .It Pa /etc/phones
 Global phone number data base.
-.It ${REMOTE}
+.It Ev ${REMOTE}
 Private system descriptions.
-.It ${PHONES}
+.It Ev ${PHONES}
 Private phone numbers.
-.It ~/.tiprc
+.It Pa ~/.tiprc
 Initialization file.
 .It Pa tip.record
 Record file.
-.It /var/log/aculog
+.It Pa /var/log/aculog
 Line access log.
 .It Pa /var/spool/lock/LCK..*
 Lock file to avoid conflicts with
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index af1ed387a636..488ef73a378b 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -228,7 +228,7 @@ If
 has a leading zero, it is interpreted as an octal value, otherwise,
 it's interpreted as a decimal value.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
@@ -256,7 +256,7 @@ the range is intended to map in another range, i.e. the command
 ``tr [a-z] [A-Z]'' will work as it will map the ``['' character in
 .Ar string1
 to the ``['' character in
-.Ar string2.
+.Ar string2 .
 However, if the shell script is deleting or squeezing characters as in
 the command ``tr -d [a-z]'', the characters ``['' and ``]'' will be 
 included in the deletion or compression list which would not have happened
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index f92881a609b7..83281c5d790b 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -47,7 +47,12 @@
 .Op Fl N Ar system
 .Op Fl w Ar wait
 .Op Fl n Ar devs
-.Op Fl p Ar type,if,pass
+.Oo
+.Fl p
+.Sm off
+.Ar type , if , pass
+.Sm on
+.Oc
 .Op Ar disks
 .Sh DESCRIPTION
 .Nm Vmstat
@@ -177,6 +182,9 @@ If no repeat
 interval is specified, the default is 1 second.
 .It Fl z
 Report on memory used by the kernel zone allocator, by zone.
+The information shown is the same as that returned by the
+.Va vm.zone
+sysctl variable.
 .El
 .Pp
 By default,
@@ -302,7 +310,8 @@ default memory file
 .Xr ps 1 ,
 .Xr systat 1 ,
 .Xr iostat 8 ,
-.Xr pstat 8
+.Xr pstat 8 ,
+.Xr sysctl 8
 .Pp
 The sections starting with ``Interpreting system activity'' in
 .%T "Installing and Operating 4.3BSD" .
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index e48eed07b1ff..a61ad1c07b6e 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -197,7 +197,7 @@ where
 is any character.  In particular,
 .Ic ^^
 is
-.Li control\-^.
+.Li control\-^ .
 .Ar Escape
 is the escape key, or
 .Ic ^\&[ .
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 29aaf8c32e39..b7f4cdb41695 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -82,7 +82,7 @@ Any single character, including newlines, may be escaped by a backslash.
 The options are as follows:
 .Bl -tag -width indent
 .It Fl 0
-Changes
+Change
 .Nm
 to expect NUL
 (``\\0'')
@@ -90,7 +90,7 @@ characters as separators, instead of spaces and newlines.
 This is expected to be used in concert with the
 .Fl print0
 function in
-.Nm find .
+.Xr find 1 .
 .It Fl n Ar number
 Set the maximum number of arguments taken from standard input for each
 invocation of the utility.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 2087f5046df8..c14754d078cc 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -153,9 +153,10 @@ utility attempts to prevent moving a file onto itself.
 Installing
 .Pa /dev/null
 creates an empty file.
-.Pp
-Upon successful completion a value of 0 is returned.
-Otherwise, a value of 1 is returned.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and 1 otherwise.
 .Sh FILES
 .Bl -tag -width INS@XXXX -compact
 .It Pa INS@XXXX
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index e857d0797a6d..14c2fd1ca820 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -184,7 +184,7 @@ Complain about unusual operations on
 and combinations of
 .Sy enum Ns -
 and
-.Sy integer Ns -Types.
+.Sy integer Ns -Types .
 .It Fl g
 Don't print warnings for some extensions of
 .Xr gcc 1
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index b9167174ba3f..1ad336664a34 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -52,4 +52,4 @@ forever.
 The
 .Nm
 command appeared in
-.Bx 4.0 .
+.At 32v .
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 55fd45edf424..6c3e44108c24 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -46,7 +46,7 @@
 prints out the values of all keys from the 
 .Tn YP
 database specified by
-.Ar mapname,
+.Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows:
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 4d069ad500aa..bd59eef8a93e 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -47,7 +47,7 @@
 prints out the values of one or more keys from the 
 .Tn YP
 database specified by
-.Ar mapname,
+.Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows: