21 files changed, 58 insertions, 65 deletions
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 511d253..571b1b8 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -254,7 +254,7 @@ No errors were found and the output was successfully created.
 Errors were found.
 .El
 .Sh FILES
-.Bl -tag -width /usr/share/locale/<language>/LC_COLLATE -compact
+.Bl -tag -width ".Pa /usr/share/locale/<language>/LC_COLLATE" -compact
 .It Pa /usr/share/locale/<language>/LC_COLLATE
 standard shared location  for  collation  orders
 under the locale locale
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 2be5733..9e5409d 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -44,7 +44,7 @@ file
 .Nm
 .Op Fl BFTaduwvx
 .Op Fl f Ar tagsfile
-.Ar name ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 7759296..8a0dc6f 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -67,7 +67,7 @@ to standard output.
 .Pp
 If the
 .Fl c
-option is specified, 
+option is specified,
 .Nm
 writes the results to standard output and keep the original files
 unchanged.
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 93eff02..26184af 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -79,12 +79,12 @@ Specify output file.
 Besides the keywords which will be listed below,
 the following are valid tokens in
 .Ar src-file :
-.Bl -tag -width literal
+.Bl -tag -width ".Ar literal"
 .It Dv RUNE
 A
 .Dv RUNE
 may be any of the following:
-.Bl -tag -width 0x[0-9a-z]*
+.Bl -tag -width ".Ar 0x[0-9a-z]*"
 .It Ar 'x'
 The ASCII character
 .Ar x .
@@ -119,7 +119,7 @@ or
 Used to indicate ranges.
 .It Ar literal
 The follow characters are taken literally:
-.Bl -tag -width "<\|\|(\|\|["
+.Bl -tag -width ".Dv <\|\|(\|\|["
 .It Dv "<\|(\|["
 Used to start a mapping.  All are equivalent.
 .It Dv ">\|\^)\|]"
@@ -130,13 +130,13 @@ Used as a delimiter in mappings.
 .El
 .Pp
 Key words which should only appear once are:
-.Bl -tag -width PHONOGRAM
+.Bl -tag -width ".Dv PHONOGRAM"
 .It Dv ENCODING
 Followed by a
 .Dv STRING
 which indicates the encoding mechanism to be used for this locale.
 The current encodings are:
-.Bl -tag -width MSKanji
+.Bl -tag -width ".Dv MSKanji"
 .It Dv BIG5
 The
 .Dq Big5
@@ -158,7 +158,7 @@ and
 No translation and the default.
 .It Dv UTF2
 (deprecated)
-.Dv "Universal character set Transformation Format"
+.Dq "Universal character set Transformation Format"
 adopted from
 .Tn "Plan 9 from Bell Labs" .
 .It Dv UTF-8
@@ -186,7 +186,7 @@ follows and is used as the invalid rune for this locale.
 .Pp
 The following keywords may appear multiple times and have the following
 format for data:
-.Bl -tag -width "<RUNE1 THRU RUNEn : RUNE2>" -offset indent
+.Bl -tag -width ".Dv <RUNE1 THRU RUNEn : RUNE2>" -offset indent
 .It Dv <RUNE1 RUNE2>
 .Dv RUNE1
 is mapped to
@@ -202,7 +202,7 @@ through
 .Dv RUNE2
 + n-1.
 .El
-.Bl -tag -width PHONOGRAM
+.Bl -tag -width ".Dv PHONOGRAM"
 .It Dv MAPLOWER
 Defines the tolower mappings.
 .Dv RUNE2
@@ -227,7 +227,7 @@ are allowed.
 .Pp
 The following keywords may appear multiple times and have the following
 format for data:
-.Bl -tag -width "RUNE1 THRU RUNEn" -offset indent
+.Bl -tag -width ".Dv RUNE1 THRU RUNEn" -offset indent
 .It Dv RUNE
 This rune has the property defined by the keyword.
 .It Dv "RUNE1 THRU RUNEn"
@@ -237,7 +237,7 @@ and
 .Dv RUNEn
 have the property defined by the keyword.
 .El
-.Bl -tag -width PHONOGRAM
+.Bl -tag -width ".Dv PHONOGRAM"
 .It Dv ALPHA
 Defines runes which are alphabetic, printable and graphic.
 .It Dv CONTROL
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 5d89dad..b028c87 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -124,7 +124,9 @@ Number the lines in a file, similar to
 .Pp
 .Dl "sed = myfile | paste -s -d '\et\en' - -"
 .Pp
-Create a colon-separated list of directories named bin, suitable
+Create a colon-separated list of directories named
+.Pa bin ,
+suitable
 for use in the
 .Ev PATH
 environment variable:
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index b999f46..35af7df 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -46,7 +46,7 @@
 .Nm env
 .Op Fl i
 .Op Ar name Ns = Ns Ar value ...
-.Op Ar utility Oo Ar argument ... Oc
+.Op Ar utility Op Ar argument ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 1a259f8..153a0fc 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -115,7 +115,7 @@ and the sample makefile to
 If option
 .Fl I
 is set,
-The server created can be started both by the port monitors
+the server created can be started both by the port monitors
 (for example,
 .Xr inetd 8 )
 or by itself.
@@ -301,7 +301,7 @@ Compile support for
 .Xr inetd 8
 in the server side stubs.
 Such servers can be self-started or can be started by
-.Nm inetd .
+.Xr inetd 8 .
 When the server is self-started, it backgrounds itself by default.
 A special define symbol
 .Em RPC_SVC_FG
@@ -312,13 +312,13 @@ the
 option.
 .Pp
 If there are no pending client requests, the
-.Nm inetd
+.Xr inetd 8
 servers exit after 120 seconds (default).
 The default can be changed with the
 .Fl K
 option.
 All the error messages for
-.Nm inetd
+.Xr inetd 8
 servers
 are always logged with
 .Xr syslog 3 .
@@ -327,7 +327,8 @@ Note:
 Contrary to some systems, in
 .Fx
 this option is needed to generate
-servers that can be invoked through portmonitors and inetd.
+servers that can be invoked through portmonitors and
+.Xr inetd 8 .
 .Pp
 .It Fl K Ar seconds
 By default, services created using
@@ -432,7 +433,6 @@ If the
 option has been specified,
 .Fl P
 is turned off automatically.
-.Pp
 .It Fl s Ar nettype
 Compile into server-side stubs for all the
 transports belonging to the class
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 2687cba..618adc9 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -423,9 +423,9 @@ The value of
 .Em flags
 in the substitute function is zero or more of the following:
 .Bl -tag -width "XXXXXX" -offset indent
-.It Em N
+.It Ar N
 Make the substitution only for the
-.Em N Ns 'th
+.Ar N Ns 'th
 occurrence of the regular expression in the pattern space.
 .It g
 Make the substitution for all non-overlapping matches of the
@@ -506,10 +506,7 @@ option on the command line.
 .El
 .Sh ENVIRONMENT
 The
-.Ev COLUMNS ,
-.Ev LANG ,
-.Ev LC_ALL ,
-.Ev LC_CTYPE
+.Ev COLUMNS , LANG , LC_ALL , LC_CTYPE
 and
 .Ev LC_COLLATE
 environment variables affect the execution of
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 0e7f25d..dd539fa 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -43,10 +43,7 @@
 .Nd show remote nfs mounts on host
 .Sh SYNOPSIS
 .Nm
-.Oo
-.Fl a |
-.Fl d
-.Oc
+.Op Fl a | d
 .Op Fl e3
 .Op Ar host
 .Sh DESCRIPTION
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index a2f544a..c6f008c 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -108,11 +108,11 @@ sockets.
 For Internet sockets, this is the address the local end of the socket
 is bound to (see
 .Xr getsockname 2 ) .
-For bound 
-.Ux 
+For bound
+.Ux
 sockets, it is the socket's filename.
-For other 
-.Ux 
+For other
+.Ux
 sockets, it is a right arrow followed by the endpoint's filename, or
 .Dq Li ??
 if the endpoint could not be determined.
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index a3f2a29..7919d52 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -126,7 +126,7 @@ will fail.
 Set the MAC label to the user's default label as part of the user
 credential setup.
 Setting the MAC label may fail if the MAC label of the invoking process
-isn't sufficient to transition to the user's default MAC label.
+is not sufficient to transition to the user's default MAC label.
 If the label cannot be set,
 .Nm
 will fail.
diff --git a/usr.bin/tabs/tabs.1 b/usr.bin/tabs/tabs.1
index 9874bca..c0c4f4d 100644
--- a/usr.bin/tabs/tabs.1
+++ b/usr.bin/tabs/tabs.1
@@ -113,9 +113,7 @@ Output escape sequence for the terminal type
 .El
 .Sh ENVIRONMENT
 The
-.Ev LANG ,
-.Ev LC_ALL ,
-.Ev LC_CTYPE
+.Ev LANG , LC_ALL , LC_CTYPE
 and
 .Ev TERM
 environment variables affect the execution of
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 424c972..3a2291c 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -136,7 +136,7 @@ If the latter form is used,
 the hostname specified becomes the default for future transfers.
 If the remote-directory form is used, the remote host is
 assumed to be a
-.Tn UNIX
+.Ux
 machine.
 To specify IPv6 numeric addresses with
 .Ar hosts ,
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index c45c184..78b7b06 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -69,11 +69,11 @@ The following options are available:
 Complement the set of characters in
 .Ar string1 ,
 that is
-.Fl C Ar ab
+.Dq Fl C Li ab
 includes every character except for
-.Ar a
+.Ql a
 and
-.Ar b .
+.Ql b .
 .It Fl c
 Same as
 .Fl C
@@ -232,9 +232,7 @@ it's interpreted as a decimal value.
 .El
 .Sh ENVIRONMENT
 The
-.Ev LANG ,
-.Ev LC_ALL ,
-.Ev LC_CTYPE
+.Ev LANG , LC_ALL , LC_CTYPE
 and
 .Ev LC_COLLATE
 environment variables affect the execution of
@@ -258,7 +256,7 @@ Strip out non-printable characters from file1.
 .D1 Li "tr -cd \*q[:print:]\*q < file1"
 .Pp
 Remove diacritical marks from all accented variants of the letter
-.Sq e :
+.Ql e :
 .Pp
 .Dl "tr \*q[=e=]\*q \*qe\*q"
 .Sh DIAGNOSTICS
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index d45099a..ef459d9 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -27,12 +27,18 @@ It does this by stopping and restarting the process being monitored via
 The options are as follows:
 .Bl -tag -width indent
 .It Fl f
-Trace decendants of the original traced process created by fork(),
-vfork, etc.
+Trace decendants of the original traced process created by
+.Xr fork 2 ,
+.Xr vfork 2 ,
+etc.
 .It Fl a
-Show the argument strings that are passed in each execve() system call.
+Show the argument strings that are passed in each
+.Xr execve 2
+system call.
 .It Fl e
-Show the environment strings that are passed in each execve() system call.
+Show the environment strings that are passed in each
+.Xr execve 2
+system call.
 .It Fl d
 Include timestamps in the output showing the time elapsed
 since the trace was started.
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 13b5db0..808092e 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -62,7 +62,7 @@ the
 If
 .Ar input_file
 is a single dash
-.Pq Sq \&-
+.Pq Sq Fl
 or absent, the standard input is read.
 If
 .Ar output_file
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 2ca022f..c3d8025 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -86,8 +86,7 @@ When an option is specified,
 .Nm
 only reports the information requested by that option.
 The default action is equivalent to specifying the
-.Fl c ,
-.Fl l
+.Fl c , l
 and
 .Fl w
 options.
@@ -96,8 +95,7 @@ If no files are specified, the standard input is used and no
 file name is displayed.
 .Sh ENVIRONMENT
 The
-.Ev LANG ,
-.Ev LC_ALL
+.Ev LANG , LC_ALL
 and
 .Ev LC_CTYPE
 environment variables affect the execution of
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index ef90123..5184732 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -42,7 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl s
-.Op Ar file Ar ...
+.Op Ar
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 1f34587..5da6152 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -44,14 +44,14 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl abmqsux
-.Op Fl BMS Ar dir Ar ... Fl f
+.Op Fl BMS Ar dir ... Fl f
 .Ar program ...
 .Sh DESCRIPTION
 The
 .Nm
 utility checks the standard binary, manual page, and source
 directories for the specified programs, printing out the paths of any
-it finds.  The supplied program names are first stripped of leading 
+it finds.  The supplied program names are first stripped of leading
 path name components, any single trailing extension added by
 .Xr gzip 1 ,
 .Xr compress 1 ,
@@ -69,7 +69,7 @@ utility for the
 .Dq user.cs_path
 string, with
 .Pa /usr/libexec ,
-.Pa /usr/games 
+.Pa /usr/games
 and the current user's
 .Ev $PATH
 appended.  Manual pages are searched by default along the
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 9fdb1d8..30540e8 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -120,9 +120,7 @@ special characters, see
 .Xr utmp 5 .
 .Sh ENVIRONMENT
 The
-.Ev COLUMNS ,
-.Ev LANG ,
-.Ev LC_ALL
+.Ev COLUMNS , LANG , LC_ALL
 and
 .Ev LC_TIME
 environment variables affect the execution of
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 521690a..34b8e35 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -108,8 +108,7 @@ Registry for Internet Numbers
 If a query to
 .Tn ARIN
 references
-.Tn APNIC ,
-.Tn LACNIC ,
+.Tn APNIC , LACNIC ,
 or
 .Tn RIPE ,
 that server will be queried also, provided that the