mdoc(7) police: split punctuation characters + misc fixes.

37 files changed, 160 insertions, 137 deletions

diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 4834e7a..96db67b 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -57,7 +57,7 @@
 .Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Nm
 .Fl q
 .Op Fl cTv
@@ -73,11 +73,11 @@
 .Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 2e4ea05..c4a3c53 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -41,45 +41,45 @@
 .Nm ar
 .Nd create and maintain library archives
 .Sh SYNOPSIS
-.Nm ar
+.Nm
 .Fl d
 .Op Fl \&Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl \&Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl abiTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl p
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar file ...
+.Nm
 .Fl q
 .Op Fl cTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl cuTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl abciuTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl t
 .Op Fl \&Tv
-.Ar archive [file ...]
-.Nm ar
+.Ar archive Op Ar file ...
+.Nm
 .Fl x
 .Op Fl ouTv
-.Ar archive [file ...]
+.Ar archive Op Ar file ...
 .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 +98,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 +131,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 +218,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 +243,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 +271,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 +287,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 +307,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 7a8e2c5..31a645e 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/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index d5e968f..3cfab68 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
@@ -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 4d76028..956e879 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 ddd5f3f..93c62b1 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 2158dec..3a3548b 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 99d6211..0bc0450 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 cf6b02e..9afcfab 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 78ddcf5..ddd2666 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -305,8 +305,7 @@ Slashes (``/'') are treated as normal characters and do not have to be
 matched explicitly.
 .It Xo
 .Ic -perm
-.Op Fl
-.Ar mode
+.Oo Fl Oc Ns Ar mode
 .Xc
 The
 .Ar mode
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1a67e5a..1169f80 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 file ...
 .Nm hd
 .Op Fl bcdovx
 .Op Fl e Ar format_string
@@ -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 29a18f0..f7529c8 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/lam/lam.1 b/usr.bin/lam/lam.1
index 942edca..447ef4f 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -40,12 +40,12 @@
 .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 ...
 .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 ...
@@ -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/limits/limits.1 b/usr.bin/limits/limits.1
index cb13e2a..d7804e2 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
@@ -63,13 +63,13 @@ command are possible:
 .Bl -hang -width indent
 .It Nm
 .Op Ar limitflags
-.Op Ar name=value
+.Op Ar name Ns = Ns Ar value
 .Ar command
 .Pp
 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
 .Op Ar limitflags
@@ -109,7 +109,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 +328,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/mail/mail.1 b/usr.bin/mail/mail.1
index 2f63da0..4585f3e 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
@@ -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 081eec8..0f74282 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.
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index e221609..de2a86f 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/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 189936c..bf5c28d 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 d07b1ff..1c60600 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 62d2312..590a305 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 8790172..2f4a02d 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 aa675f8..3179ad2 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 
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index aa675f8..3179ad2 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 
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f2fe693..a9902b4 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -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/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index ec65203..59498c2 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -51,7 +51,9 @@
 .Op Fl P Ar rshcmd
 .Fl c
 .Ar name ...\&
-.Oo login@ Oc Ns Ar host Ns Op :dest
+.Oo Ar login Ns @ Oc Ns Xo
+.Ar host Ns Op : Ns Ar dest
+.Xc
 .Sh DESCRIPTION
 .Nm Rdist
 is a program to maintain identical copies of files over multiple hosts.
@@ -110,7 +112,7 @@ The equivalent distfile is as follows.
 .Bd -filled -offset indent -compact
 .Pq Ar name ...\&
 .Li ->
-.Op Ar login@
+.Op Ar login Ns @
 .Ar host
 .Bd -filled -offset indent -compact
 .Li install
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index b6c330d..e8a705d 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -220,10 +220,8 @@ Determines the user's terminal type.
 .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/systat/systat.1 b/usr.bin/systat/systat.1
index e812e1a..146bfa9 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
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index c2b7830..559ae71 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.
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index b6e6b79..56bf056 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 f8c1dd4..d77e38c 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 21191e1..355fab5 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 ad55ca9..488ef73 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -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 920a227..83281c5 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
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index e48eed0..a61ad1c 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/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index e857d07..14c2fd1 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/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 55fd45e..6c3e441 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 4d069ad..bd59eef 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: