31 files changed, 112 insertions, 110 deletions

diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index d9feaf9637c1..856a6d6d45ce 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -99,7 +99,7 @@ to
 .Pa /usr/bin .
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Sh  DIAGNOSTICS
+.Sh DIAGNOSTICS
 .Ex -std basename dirname
 .Sh SEE ALSO
 .Xr csh 1 ,
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 8a86482ee5b0..9faa3865830c 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -217,9 +217,9 @@ Calendar of events in France.
 .It Pa calendar.german
 Calendar of events in Germany.
 .It Pa calendar.history
-Everything  else, mostly U.S.\& historical events.
+Everything else, mostly U.S.\& historical events.
 .It Pa calendar.holiday
-Other  holidays, including the not-well-known, obscure, and
+Other holidays, including the not-well-known, obscure, and
 .Em really
 obscure.
 .It Pa calendar.judaic
@@ -227,8 +227,8 @@ Jewish holidays.
 This calendar should be updated yearly by the local system administrator
 so that roving holidays are set correctly for the current year.
 .It Pa calendar.music
-Musical  events,  births, and deaths.
-Strongly  oriented  toward  rock 'n' roll.
+Musical events, births, and deaths.
+Strongly oriented toward rock 'n' roll.
 .It Pa calendar.newzealand
 Calendar of events in New Zealand.
 .It Pa calendar.russian
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index e2132e5f15eb..7770dac5d96b 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -54,7 +54,7 @@ feeds, and replaces white-space characters with tabs where possible.
 This can be useful in processing the output of
 .Xr nroff 1
 and
-.Xr tbl  1 .
+.Xr tbl 1 .
 .Pp
 The
 .Nm
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index f57c99290ef7..c3c574fa9404 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -9,7 +9,7 @@
 .Nd easy editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl  eih
+.Op Fl eih
 .Op +#
 .Op Ar
 .Nm ree
@@ -61,7 +61,7 @@ Move the cursor to line '#' at startup.
 To do anything other than insert text, the user must use the control
 keys (the
 .Li Control
-key, represented by a "^",  pressed in conjunction with an
+key, represented by a "^", pressed in conjunction with an
 alphabetic key, e.g., ^a) and function keys available on the keyboard
 (such as
 .Em "Next Page" ,
@@ -313,7 +313,7 @@ Line with no characters, or only spaces and/or tabs.
 Line starting with a period ('.') or right angle bracket ('>').
 .El
 .Pp
-A paragraph may be formatted two ways:  explicitly by choosing the
+A paragraph may be formatted two ways: explicitly by choosing the
 .Em format paragraph
 menu item, or by setting
 .Nm
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 5134d1e89ee9..411f4b18723e 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -101,7 +101,7 @@ possible for them to disappear while
 .Nm
 is running.
 This
-is normal and  unavoidable since the rest of the system is running while
+is normal and unavoidable since the rest of the system is running while
 .Nm
 itself is running.
 .It Ar
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 64fa2474bfcc..981e0be3b346 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -49,7 +49,7 @@ The
 .Nm
 utility creates a core image of the specified process,
 suitable for use with
-.Xr gdb  1 .
+.Xr gdb 1 .
 By default, the core is written to the file
 .Dq Pa core.<pid> .
 The process identifier,
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 6fffa51fd472..70c0e9c86795 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -77,7 +77,7 @@ Any string following
 a space following the set identifier is treated as a comment.
 If no
 .Li $set
-directive  is specified in a given source file, all messages will
+directive is specified in a given source file, all messages will
 be located in the default message set NL_SETD.
 .It Li $del Ar n comment
 This line deletes messages from set
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 3de5c77e5d84..b57cc294c03a 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -108,7 +108,7 @@ Whatever
 has.
 .Pp
 Arguments containing white space or embedded shell metacharacters
-generally will not survive intact;  this looks easy to fix but
+generally will not survive intact; this looks easy to fix but
 isn't.
 People trying to fix
 .Nm
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 4415e890f00e..1481c330cb9b 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -109,7 +109,7 @@ time and call counts of the cycle.
 .Pp
 Second, a flat profile is given,
 similar to that provided by
-.Xr prof  1  .
+.Xr prof 1 .
 This listing gives the total execution times, the call counts,
 the time in msec or usec the call spent in the routine itself, and
 the time in msec or usec the call spent in the routine itself including
@@ -153,7 +153,7 @@ option.
 Suppress the printing of the graph profile entry for routine
 .Ar name
 (and its descendants) as
-.Fl e  ,
+.Fl e ,
 above, and also excludes the time spent in
 .Ar name
 (and its descendants) from the total and percentage time computations.
@@ -320,6 +320,6 @@ propagated properly, unless the signal catcher was invoked during
 the execution of the profiling routine, in which case all is lost.
 .Pp
 The profiled program must call
-.Xr exit  3
+.Xr exit 3
 or return normally for the profiling information to be saved
 in the graph profile file.
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index cbbeb9454f16..f6ecc62959d6 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -99,9 +99,9 @@ specified are described below.
 They may appear before or after the file
 names.
 .Pp
-.Sy NOTE  :
+.Sy NOTE :
 If you only specify an
-.Ar input-file  ,
+.Ar input-file ,
 the formatting is
 done `in-place', that is, the formatted file is written back into
 .Ar input-file
@@ -120,7 +120,7 @@ If
 is specified,
 .Nm
 checks to make sure it is different from
-.Ar input-file  .
+.Ar input-file .
 .Pp
 The options listed below control the formatting style imposed by
 .Nm .
@@ -131,7 +131,7 @@ If
 is specified, a blank line is forced after every block of
 declarations.
 Default:
-.Fl nbad  .
+.Fl nbad .
 .It Fl bap , nbap
 If
 .Fl bap
@@ -151,7 +151,7 @@ is specified, then a newline is forced after each comma in a declaration.
 .Fl nbc
 turns off this option.
 Default:
-.Fl \&nbc  .
+.Fl \&nbc .
 .It Fl \&br , \&bl
 Specifying
 .Fl \&bl
@@ -197,15 +197,15 @@ Rather than like this:
 This only affects block comments, not comments to the right of
 code.
 The default is
-.Fl cdb  .
+.Fl cdb .
 .It Fl ce , nce
 Enables (disables) forcing of `else's to cuddle up to the immediately preceding
 `}'.
 The default is
-.Fl \&ce  .
+.Fl \&ce .
 .It Fl \&ci Ns Ar n
 Sets the continuation indent to be
-.Ar n  .
+.Ar n .
 Continuation
 lines will be indented that far from the beginning of the first line of the
 statement.
@@ -216,7 +216,7 @@ is in effect
 or the contination indent is exactly half of the main indent.
 .Fl \&ci
 defaults to the same value as
-.Fl i  .
+.Fl i .
 .It Fl cli Ns Ar n
 Causes case labels to be indented
 .Ar n
@@ -227,7 +227,7 @@ statement.
 causes case labels to be indented half a tab stop.
 The
 default is
-.Fl cli0  .
+.Fl cli0 .
 .It Fl d Ns Ar n
 Controls the placement of comments which are not to the
 right of code.
@@ -245,14 +245,14 @@ Specifies the indentation, in character positions,
 of global variable names and all struct/union member names
 relative to the beginning of their type declaration.
 The default is
-.Fl di16  .
+.Fl di16 .
 .It Fl dj , ndj
 .Fl \&dj
 left justifies declarations.
 .Fl ndj
 indents declarations the same as code.
 The default is
-.Fl ndj  .
+.Fl ndj .
 .It Fl \&ei , nei
 Enables (disables) special
 .Ic else-if
@@ -265,12 +265,12 @@ will have the same indentation as the preceding
 .Ic \&if
 statement.
 The default is
-.Fl ei  .
+.Fl ei .
 .It Fl fbs , nfbs
 Enables (disables) splitting the function declaration and opening brace
 across two lines.
 The default is
-.Fl fbs  .
+.Fl fbs .
 .It Fl fc1 , nfc1
 Enables (disables) the formatting of comments that start in column 1.
 Often, comments whose leading `/' is in column 1 have been carefully
@@ -280,7 +280,7 @@ In such cases,
 should be
 used.
 The default is
-.Fl fc1  .
+.Fl fc1 .
 .It Fl fcb , nfcb
 Enables (disables) the formatting of block comments (ones that begin
 with `/*\\n').
@@ -292,7 +292,7 @@ In such cases,
 should be used.
 Block comments are then handled like box comments.
 The default is
-.Fl fcb  .
+.Fl fcb .
 .It Fl i Ns Ar n
 The number of spaces for one indentation level.
 The default is 8.
@@ -300,7 +300,7 @@ The default is 8.
 Enables (disables) the indentation of parameter declarations from the left
 margin.
 The default is
-.Fl \&ip  .
+.Fl \&ip .
 .It Fl l Ns Ar n
 Maximum length of an output line.
 The default is 78.
@@ -351,7 +351,7 @@ If true
 all procedure calls will have a space inserted between
 the name and the `('.
 The default is
-.Fl npcs  .
+.Fl npcs .
 .It Fl psl , npsl
 If true
 .Pq Fl psl
@@ -359,12 +359,12 @@ the names of procedures being defined are placed in
 column 1 \- their types, if any, will be left on the previous lines.
 The
 default is
-.Fl psl  .
+.Fl psl .
 .It Fl \&sc , nsc
 Enables (disables) the placement of asterisks (`*'s) at the left edge of all
 comments.
 The default is
-.Fl sc  .
+.Fl sc .
 .It Fl sob , nsob
 If
 .Fl sob
@@ -372,7 +372,7 @@ is specified, indent will swallow optional blank lines.
 You can use this to
 get rid of blank lines after declarations.
 Default:
-.Fl nsob  .
+.Fl nsob .
 .It Fl \&st
 Causes
 .Nm
@@ -413,7 +413,7 @@ rather than formatting in place.
 Enables (disables) the use of tab characters in the output.
 Tabs are assumed to be aligned on columns divisble by 8.
 The default is
-.Fl ut  .
+.Fl ut .
 .It Fl v , \&nv
 .Fl v
 turns on `verbose' mode;
@@ -424,7 +424,7 @@ When in verbose mode,
 reports when it splits one line of input into two or more lines of output,
 and gives some size statistics at completion.
 The default is
-.Fl \&nv  .
+.Fl \&nv .
 .El
 .Pp
 You may set up your own `profile' of defaults to
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index 16da68678f0b..8a3927dfb65a 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -25,6 +25,6 @@ to be used by any secure network services, such as NFS.
 .Xr chkey 1 ,
 .Xr keylogout 1 ,
 .Xr login 1 ,
-.Xr publickey  5 ,
+.Xr publickey 5 ,
 .Xr keyserv 8 ,
 .Xr newkey 8
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index a4808c59afac..585822fec8ef 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -102,7 +102,7 @@ executions of commands named
 by user
 .Ar root
 on the terminal
-.Ar ttyd0  .
+.Ar ttyd0 .
 .Pp
 For each process entry, the following are printed.
 .Pp
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 25cb9e1061fe..7bfd78ca55e7 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -49,7 +49,7 @@
 The
 .Nm
 program searches a database for all pathnames which match the specified
-.Ar pattern  .
+.Ar pattern .
 The database is recomputed periodically (usually weekly or daily),
 and contains the pathnames
 of all files which are publicly accessible.
@@ -62,7 +62,7 @@ Shell globbing and quoting characters
 and
 .Dq \&] )
 may be used in
-.Ar pattern  ,
+.Ar pattern ,
 although they will have to be escaped from the shell.
 Preceding any character with a backslash
 .Pq Dq \e
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 1654bde7ac59..c5c7dff19763 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -50,7 +50,7 @@
 The
 .Nm
 utility provides a shell command interface to the
-.Xr syslog  3
+.Xr syslog 3
 system log module.
 .Pp
 The following options are available:
@@ -94,7 +94,7 @@ facility.
 The default is ``user.notice.''
 .It Fl t Ar tag
 Mark every line in the log with the specified
-.Ar tag  .
+.Ar tag .
 .It Ar message
 Write the message to log; if not specified, and the
 .Fl f
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 9ebaa65c0180..81d605e65d72 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -67,7 +67,7 @@ logged in user is logging in as themselves.
 .It Fl h
 Specify the host from which the connection was received.
 It is used by various daemons such as
-.Xr telnetd  8 .
+.Xr telnetd 8 .
 This option may only be used by the super-user.
 .It Fl p
 By default,
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index e0bbaa559a33..6cced8f8de2c 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -54,7 +54,7 @@ utility outputs a list of file names where the first file contains a symbol
 which is defined by the second file.
 .Pp
 The output is normally used with
-.Xr tsort  1
+.Xr tsort 1
 when a library is created to determine the optimum ordering of the
 object modules so that all references may be resolved in a single
 pass of the loader.
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 7ce479c82799..6d7a33731ae5 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -44,7 +44,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl m Ar mode
-.Ar fifo_name  ...
+.Ar fifo_name ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 8d7010271c9c..067047a0d441 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -227,7 +227,7 @@ is the upper case representation of
 .It Dv TODIGIT
 Defines a map from runes to their digit value.
 .Dv RUNE2
-is the integer value represented  by
+is the integer value represented by
 .Dv RUNE1 .
 For example, the ASCII character
 .Ql 0
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 9f6d125f297c..147f8c9e4232 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -96,7 +96,7 @@ the default ``Messages''.
 .It Fl m
 A copy of the specified message is placed in a temporary
 mailbox and
-.Xr mail  1
+.Xr mail 1
 is invoked on that mailbox.
 Both `m' and `s' accept a numeric argument in place of the `\-'.
 .El
@@ -200,7 +200,7 @@ messages back from the one indicated in the
 file, useful for reviews of recent messages.
 .It Fl p
 Pipe long messages through
-.Xr more  1  .
+.Xr more 1 .
 .El
 .Pp
 Within
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index e37952548c38..d94f28d88e41 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -53,7 +53,7 @@ By default
 performs the requested operation once.
 Operations
 may be performed multiple times by specifying
-.Ar count  .
+.Ar count .
 Note
 that
 .Ar tapename
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 1f0df7b1ffb6..6b0039a2cb0d 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -95,7 +95,7 @@ The following option is available:
 Cause the password to be updated only in the local
 password file, and not with the Kerberos database.
 When changing only the local password,
-.Xr pwd_mkdb  8
+.Xr pwd_mkdb 8
 is used to update the password databases.
 .El
 When changing local or NIS password, the next password change date
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 3dfb0f2cc073..86b08b382e83 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -43,20 +43,20 @@
 .Nd formatted output
 .Sh SYNOPSIS
 .Nm
-.Ar format Op Ar arguments  ...
+.Ar format Op Ar arguments ...
 .Sh DESCRIPTION
 The
 .Nm
 utility formats and prints its arguments, after the first, under control
 of the
-.Ar format  .
+.Ar format .
 The
 .Ar format
 is a character string which contains three types of objects: plain characters,
 which are simply copied to standard output, character escape sequences which
 are converted and copied to the standard output, and format specifications,
 each of which causes printing of the next successive
-.Ar argument  .
+.Ar argument .
 .Pp
 The
 .Ar arguments
@@ -77,7 +77,7 @@ code of the next character.
 .El
 .Pp
 The format string is reused as often as necessary to satisfy the
-.Ar arguments  .
+.Ar arguments .
 Any extra format specifications are evaluated with zero or the null
 string.
 .Pp
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 6955339dc577..7c8bd2903c90 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -49,7 +49,7 @@
 The
 .Nm
 utility starts a terminal session on a remote host
-.Ar host  .
+.Ar host .
 .Pp
 The
 .Nm
@@ -131,7 +131,7 @@ Each user may have a private authorization list in the file
 in their home directory.
 Each line in this file should contain a Kerberos principal name of the
 form
-.Ar principal.instance@realm  .
+.Ar principal.instance@realm .
 If the originating user is authenticated to one of the principals named
 in
 .Pa .klogin ,
@@ -144,7 +144,7 @@ there is no
 file.
 Otherwise a login and password will be prompted for on the remote machine
 as in
-.Xr login  1  .
+.Xr login 1 .
 To avoid certain security problems, the
 .Pa .klogin
 file must be owned by
@@ -195,7 +195,7 @@ IPv6 support was added by WIDE/KAME project.
 The
 .Nm
 utility will be replaced by
-.Xr telnet  1
+.Xr telnet 1
 in the near future.
 .Pp
 More of the environment should be propagated.
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 85230f1ce6e6..73bab2597630 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -166,7 +166,7 @@ command appeared in
 .Bx 4.2 .
 .Sh BUGS
 If you are using
-.Xr csh  1
+.Xr csh 1
 and put a
 .Nm
 in the background without redirecting its input away from the terminal,
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 64b0c4d9edba..1c93b3e48a15 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -59,7 +59,7 @@ is given,
 saves all dialogue in
 .Ar file .
 If no file name is given, the typescript is saved in the file
-.Pa typescript  .
+.Pa typescript .
 .Pp
 If the argument
 .Ar command
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index d44fe6419f4b..09adc5e4c69f 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -56,9 +56,9 @@ utility does this correctly).
 The
 .Nm
 command is normally used for distributing files by
-.Xr ftp  1
+.Xr ftp 1
 or
-.Xr mail  1  .
+.Xr mail 1 .
 .Sh SEE ALSO
 .Xr compress 1 ,
 .Xr mail 1 ,
@@ -79,7 +79,7 @@ It is easy to insert trojan horses into
 files.
 It is strongly recommended that all shell archive files be examined
 before running them through
-.Xr sh  1  .
+.Xr sh 1 .
 Archives produced using this implementation of
 .Nm
 may be easily examined with the command:
@@ -88,11 +88,11 @@ egrep -v '^[X#]' shar.file
 .Ed
 .Sh EXAMPLES
 To create a shell archive of the program
-.Xr ls  1
+.Xr ls 1
 and mail it to Rick:
 .Bd -literal -offset indent
 cd ls
-shar `find . -print` \&|  mail -s "ls source" rick
+shar `find . -print` \&| mail -s "ls source" rick
 .Ed
 .Pp
 To recreate the program directory:
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 216f75ba5bfe..3763049a973d 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -221,7 +221,7 @@ while the second is an argument to the shell being invoked.
 Simulate a login for user foo.
 .It Li "su - foo"
 Same as above.
-.It Li "su -  "
+.It Li "su -"
 Simulate a login for root.
 .El
 .Sh HISTORY
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index ace79a25617a..23add08a66d2 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -68,14 +68,14 @@ in the lower window.
 Other displays show swap space usage, disk
 .Tn I/O
 statistics (a la
-.Xr iostat  8  ) ,
+.Xr iostat 8 ) ,
 virtual memory statistics (a la
-.Xr vmstat  8  ) ,
+.Xr vmstat 8 ) ,
 network ``mbuf'' utilization,
 .Tn TCP/IP
 statistics,
 and network connections (a la
-.Xr netstat  1  ) .
+.Xr netstat 1 ) .
 .Pp
 Input is interpreted at two different levels.
 A ``global'' command interpreter processes all keyboard input.
@@ -156,7 +156,7 @@ value.
 Exit
 .Nm .
 (This may be abbreviated to
-.Ic q  . )
+.Ic q . )
 .El
 .Pp
 The available displays are:
@@ -455,7 +455,7 @@ spaces.
 Display information about the connections associated with the
 specified hosts or ports.
 As for
-.Ar ignore  ,
+.Ar ignore ,
 .Op Ar items
 may be names or numbers.
 .It Cm show Op Ar ports\&|hosts
@@ -468,7 +468,7 @@ If
 or
 .Ar hosts
 is supplied as an argument to
-.Cm show  ,
+.Cm show ,
 then only the requested information will be displayed.
 .It Cm reset
 Reset the port, host, and protocol matching mechanisms to the default
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 1bf73aecde4b..b32883fbfb59 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -111,7 +111,7 @@ some particular feature
 and string
 capabilities which give a regular expression or
 keyword list.
-.Sh REGULAR  EXPRESSIONS
+.Sh REGULAR EXPRESSIONS
 .Nm Vgrindefs
 uses regular expression which are very similar to those of
 .Xr ex 1
@@ -150,11 +150,11 @@ This is typically used for languages (like C) which can include the
 string delimiter in a string by escaping it.
 .El
 .Pp
-Unlike other regular expressions in the system,  these match words
+Unlike other regular expressions in the system, these match words
 and not characters.
 Hence something like "(tramp|steamer)flies?"
 would match "tramp", "steamer", "trampflies", or "steamerflies".
-.Sh KEYWORD  LIST
+.Sh KEYWORD LIST
 The keyword list is just a list of keywords in the language separated
 by spaces.
 If the "oc" boolean is specified, indicating that upper
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index c3d8025d0a25..0656a5e715ae 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -120,7 +120,9 @@ Historically, the
 utility was documented to define a word as a ``maximal string of
 characters delimited by <space>, <tab> or <newline> characters''.
 The implementation, however, didn't handle non-printing characters
-correctly so that ``  ^D^E  '' counted as 6 spaces, while ``foo^D^Ebar''
+correctly so that
+.Dq "  ^D^E  "
+counted as 6 spaces, while ``foo^D^Ebar''
 counted as 8 characters.
 .Bx 4
 systems after
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index cc5f760f60e8..17035ad0dd18 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -96,14 +96,14 @@ and create the two default
 windows instead.
 .It Fl e Ar escape-char
 Set the escape character to
-.Ar escape-char  .
+.Ar escape-char .
 .Ar Escape-char
 can be a single character, or in the form
 .Ic ^X
 where
 .Ar X
 is any character, meaning
-.No control\- Ns Ar X  .
+.No control\- Ns Ar X .
 .It Fl c Ar command
 Execute the string
 .Ar command
@@ -119,7 +119,7 @@ identifier, as well as a user definable label string, are displayed
 with the window on the top edge of its frame.
 A window can be
 designated to be in the
-.Ar foreground  ,
+.Ar foreground ,
 in which case it will always be
 on top of all normal, non-foreground windows, and can be covered
 only by other foreground windows.
@@ -162,7 +162,7 @@ entry tailored to this window is created
 and passed as environment (see
 .Xr environ 7 )
 variable
-.Ev TERMCAP  .
+.Ev TERMCAP .
 The termcap entry contains the window's size and
 characteristics as well as information from the physical terminal,
 such as the existence of underline, reverse video, and other display
@@ -214,7 +214,7 @@ represents one of the digits ``1'' to ``9''
 corresponding to the windows 1 to 9.
 .Ic ^X
 means
-.No control\- Ns Ar X  ,
+.No control\- Ns Ar X ,
 where
 .Ar X
 is any character.
@@ -694,7 +694,7 @@ as a statement, the parentheses surrounding
 the argument list may be omitted.
 Aliases return no value.
 .El
-.Ss  Builtin Functions
+.Ss Builtin Functions
 The arguments are listed by name in their natural
 order.
 Optional arguments are in square brackets
@@ -739,12 +739,12 @@ Close the windows specified in
 If
 .Aq Ar window\-list
 is the word
-.Ar all  ,
+.Ar all ,
 than all windows are closed.
 No value is returned.
 .It Ic cursormodes Ns Pq Bq Ar modes
 Set the window cursor to
-.Ar modes  .
+.Ar modes .
 .Ar Modes
 is the bitwise
 or of the mode bits defined as the variables
@@ -766,7 +766,7 @@ sets the window cursors to blinking
 reverse video.
 .It Ic default_nline Ns Pq Bq Ar nline
 Set the default buffer size to
-.Ar nline  .
+.Ar nline .
 Initially, it is
 48 lines.
 Returns the old default buffer size.
@@ -782,7 +782,7 @@ the first string in the old shell setting.
 Default is no change.
 Initially,
 the default shell is taken from the environment variable
-.Ev SHELL  .
+.Ev SHELL .
 .It Ic default_smooth Ns Pq Bq Ar flag
 Set the default value of the
 .Ar smooth
@@ -792,12 +792,12 @@ to the command
 (see below).
 The argument
 is a boolean flag (one of
-.Ar on  ,
-.Ar off  ,
-.Ar yes  ,
-.Ar no  ,
-.Ar true  ,
-.Ar false  ,
+.Ar on ,
+.Ar off ,
+.Ar yes ,
+.Ar no ,
+.Ar true ,
+.Ar false ,
 or a number,
 as described above).
 Default is no change.
@@ -823,7 +823,7 @@ Default
 is the current window.
 .It Ic escape Ns Pq Bq Ar escapec
 Set the escape character to
-.Ar escape-char  .
+.Ar escape-char .
 Returns the old
 escape character as a one-character string.
 Default is no
@@ -858,7 +858,7 @@ is no change.
 Set the label of
 .Nm
 to
-.Ar label  .
+.Ar label .
 Returns the old
 label as a string.
 Default for
@@ -883,11 +883,11 @@ is returned.
 Default is no change.
 .It Ic source Ns Pq Ar filename
 Read and execute the long commands in
-.Ar filename  .
+.Ar filename .
 Returns \-1 if the file cannot be read, 0 otherwise.
 .It Ic terse Ns Pq Bq flag
 Set terse mode to
-.Ar flag  .
+.Ar flag .
 In terse mode, the command window
 stays hidden even in command mode, and errors are reported by
 sounding the terminal's bell.
@@ -900,14 +900,14 @@ Returns the old terse flag.
 Default is no change.
 .It Ic unalias Ns Pq Ar alias
 Undefine
-.Ar alias  .
+.Ar alias .
 Returns -1 if
 .Ar alias
 does not exist,
 0 otherwise.
 .It Ic unset Ns Pq Ar variable
 Undefine
-.Ar variable  .
+.Ar variable .
 Returns -1 if
 .Ar variable
 does not exist,
@@ -931,11 +931,11 @@ No value is returned.
 .Bq Ar shell ) .
 .Xc
 Open a window with upper left corner at
-.Ar row  ,
+.Ar row ,
 .Ar column
 and size
-.Ar nrow  ,
-.Ar ncol  .
+.Ar nrow ,
+.Ar ncol .
 If
 .Ar nline
 is specified,
@@ -943,9 +943,9 @@ then that many lines are allocated for the text buffer.
 Otherwise,
 the default buffer size is used.
 Default values for
-.Ar row  ,
-.Ar column  ,
-.Ar nrow  ,
+.Ar row ,
+.Ar column ,
+.Ar nrow ,
 and
 .Ar ncol
 are, respectively,
@@ -953,8 +953,8 @@ the upper, left-most, lower, or right-most extremes of the
 screen.
 .Ar Label
 is the label string.
-.Ar Frame  ,
-.Ar pty  ,
+.Ar Frame ,
+.Ar pty ,
 and
 .Ar mapnl
 are flag values
@@ -984,7 +984,7 @@ command (see above).
 is a list of strings that will be used as the shell
 program to place in the window (default is the program specified
 by
-.Ar default_shell  ,
+.Ar default_shell ,
 see above).
 The created window's identifier
 is returned as a number.