13 files changed, 45 insertions, 44 deletions

diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index d02eaa0dc4a2..324d8a2143c8 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -63,22 +63,22 @@
 .Sh DESCRIPTION
 The
 .Nm
-command
+utility
 allows editing of the user database information associated
 with
 .Ar user
 or, by default, the current user.
 .Pp
 The
-.Xr chfn 1 ,
-.Xr chsh 1 ,
-.Xr ypchpass 1 ,
-.Xr ypchfn 1
+.Nm chfn ,
+.Nm chsh ,
+.Nm ypchpass ,
+.Nm ypchfn
 and
-.Xr ypchsh 1
-commands behave identically to
+.Nm ypchsh
+utilities behave identically to
 .Nm .
-.Pq There is only one program.
+(There is only one program.)
 .Pp
 The information is formatted and supplied to an editor for changes.
 .Pp
@@ -406,7 +406,7 @@ The
 .Nm
 utility uses the system domain name by default, as set by the
 .Xr domainname 1
-command.
+utility.
 The
 .Fl d
 option can be used to override a default, or to specify a domain
@@ -486,5 +486,5 @@ User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
 .Nm
-command appeared in
+utility appeared in
 .Bx 4.3 Reno .
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 2dfd0d81a43c..c8b21eb2cd02 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -85,7 +85,7 @@ tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
 .Xr ul 1
 .Sh BUGS
 Should fold underlines onto blanks even with the
-.Ql Fl
+.Sq Fl
 option so that
 a true underline character would show.
 .Pp
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 6a1edb1281ac..571b1b868095 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -254,9 +254,11 @@ No errors were found and the output was successfully created.
 Errors were found.
 .El
 .Sh FILES
-.Ar /usr/share/locale/<language>/LC_COLLATE
+.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
+.El
 .Sh SEE ALSO
 .Xr mklocale 1 ,
 .Xr setlocale 3 ,
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 21eb593f6dd9..ee1e34874484 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -45,33 +45,34 @@ utility removes the specified message queues, semaphores and shared memory
 segments.  These System V IPC objects can be specified by their
 creation id or any associated key.
 .Pp
-The following options are used to specify which IPC objects will be removed.  Any number and combination of these options can be used:
+The following options are used to specify which IPC objects will be removed.
+Any number and combination of these options can be used:
 .Bl -tag -width indent
 .It Fl q Ar msqid
 Remove the message queue associated with the id
-.Nm msqid
+.Ar msqid
 from the system.
 .It Fl m Ar shmid
 Mark the shared memory segment associated with id
-.Nm shmid
+.Ar shmid
 for removal.
 This marked segment will be destroyed after the last detach.
 .It Fl s Ar semid
-Removes the semaphore set associated with id
-.Nm semid
+Remove the semaphore set associated with id
+.Ar semid
 from the system.
 .It Fl Q Ar msgkey
 Remove the message queue associated with key
-.Nm msgkey
+.Ar msgkey
 from the system.
 .It Fl M Ar shmkey
 Mark the shared memory segment associated with key
-.Nm shmkey
+.Ar shmkey
 for removal.
 This marked segment will be destroyed after the last detach.
 .It Fl S Ar semkey
 Remove the semaphore set associated with key
-.Nm semkey
+.Ar semkey
 from the system.
 .El
 .Pp
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index e9fff1ec4edf..15270d01f8f0 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -111,7 +111,7 @@ is a field number, or the form
 .Pq zero ,
 representing the join field.
 The elements of list must be either comma
-.Pf ( Dq , Ns )
+.Pq Ql \&,
 or whitespace separated.
 (The latter requires quoting to protect it from the shell, or, a simpler
 approach is to use multiple
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index ba0cc03ebc10..6c33367b85ab 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -68,7 +68,7 @@ All times are converted to a 12 hour clock, and assumed to
 be in the next 12 hours.
 .It Cm \&+
 If the time is preceded by
-.Ql Cm \&+ ,
+.Sq Cm \&+ ,
 the alarm will go off in hours and minutes
 from the current time.
 .El
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index bec4eaa36084..5fc2cc7d2c7e 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 ">\|\^)\|]"
@@ -168,7 +168,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
@@ -184,7 +184,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
@@ -209,7 +209,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"
@@ -219,7 +219,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 5d89dada5226..f9a1dc376033 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -105,11 +105,11 @@ option.
 .El
 .Pp
 If
-.Ql Fl
+.Sq Fl
 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 .
+.Sq Fl .
 .Sh EXAMPLES
 List the files in the current directory in three columns:
 .Pp
@@ -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/sed/sed.1 b/usr.bin/sed/sed.1
index 2687cba54273..618adc9fe28c 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/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index 31aeca12dbdf..2f858951fbb2 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -59,7 +59,7 @@ do not normally do this; it allows the placement of individual tables
 in separate files to be run as a part of a large document.
 .Pp
 An argument consisting of a single minus
-.Ql Fl
+.Sq Fl
 is taken to be
 a file name corresponding to the standard input.
 .Pp
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 03c87851171e..b83543fbdad2 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -115,6 +115,7 @@ files named with prefixes in the range of
 .Dq Li x-z
 and with suffixes as above.
 .Sh SEE ALSO
+.Xr csplit 1 ,
 .Xr re_format 7
 .Sh STANDARDS
 The
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 8ad362e4d201..c88dcd051992 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -101,11 +101,11 @@ otherwise be preserved in a tape-to-tape copy.
 EOD is determined by two sequential EOF marks with no data between.
 There are old systems which typically wrote three EOF's between tape
 files.
-.Xr tcopy 1
+.Nm
 will erroneously stop copying early in this case.
 .It
 When using the copy/verify option \-c
-.Xr tcopy 1
+.Nm
 does not rewind the tapes prior to start.
 A rewind is performed
 after writing prior to the verification stage.
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 9fdb1d830e16..30540e83fe63 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