diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index 099eec6efc11..048bf38b0f57 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -162,7 +162,7 @@ to put the system in the suspend state.
 .Pp
 .Bl -bullet
 .It
-The  apm_event keyword
+The apm_event keyword
 .Bd -ragged -offset indent
 .Ql apm_event
 is the keyword which indicates the start of configuration for
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index dd9f10ba202c..906d4ddf852f 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -88,7 +88,7 @@ Use
 .Ar language
 for description and menu
 .It Fl p , Fl print
-Print description  of available keymaps or fonts
+Print description of available keymaps or fonts
 to stdout and exit.
 .It Fl r , Fl restore
 Load default font from
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index c297ab19c0aa..22b235e7f8df 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -43,13 +43,13 @@
 .Op Fl a
 .Op Fl l
 .Op Fl P Ns Ar printer
-.Op  job # ...\&
-.Op  user ...\&
+.Op job # ...\&
+.Op user ...\&
 .Sh DESCRIPTION
 The
 .Nm
 utility examines the spooling area used by
-.Xr lpd  8
+.Xr lpd 8
 for printing files on the line printer, and reports the status of the
 specified jobs or all jobs associated with a user.
 The
@@ -78,12 +78,12 @@ rather than just the specified printer.
 .El
 .Pp
 For each job submitted (i.e., invocation of
-.Xr lpr  1  )
+.Xr lpr 1 )
 .Nm
 reports the user's name, current rank in the queue, the
 names of files comprising the job, the job identifier (a number which
 may be supplied to
-.Xr lprm  1
+.Xr lprm 1
 for removing a specific job), and the total size in bytes.
 Job ordering is dependent on
 the algorithm used to scan the spooling directory and is supposed
@@ -92,7 +92,7 @@ to be
 (First in First Out).
 File names comprising a job may be unavailable
 (when
-.Xr lpr  1
+.Xr lpr 1
 is used as a sink in a pipeline) in which case the file
 is indicated as ``(standard input)''.
 .Pp
@@ -100,7 +100,7 @@ If
 .Nm
 warns that there is no daemon present (i.e., due to some malfunction),
 the
-.Xr lpc  8
+.Xr lpc 8
 command can be used to restart the printer daemon.
 .Sh ENVIRONMENT
 If the following environment variable exists, it is used by
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index 1b72b9c384d8..3850bf597de5 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -140,7 +140,7 @@ Usually files are copied to the spool directory.
 The
 .Fl s
 option will use
-.Xr symlink  2
+.Xr symlink 2
 to link data files rather than trying to copy them so large files can be
 printed.
 This means the files should
@@ -158,7 +158,8 @@ For example,
 lpr \-#3 foo.c bar.c more.c
 .Ed
 would result in 3 copies of the file foo.c, followed by 3 copies
-of the file bar.c, etc.\&  On the other hand,
+of the file bar.c, etc.
+On the other hand,
 .Bd -literal -offset indent
 cat foo.c bar.c more.c \&| lpr \-#3
 .Ed
@@ -174,7 +175,7 @@ instead.
 Specifies a
 .Ar font
 to be mounted on font position
-.Ar i  .
+.Ar i .
 The daemon
 will construct a
 .Li .railmag
@@ -189,7 +190,7 @@ lpr \-C EECS foo.c
 .Ed
 .Pp
 causes the system name (the name returned by
-.Xr hostname  1  )
+.Xr hostname 1 )
 to be replaced on the burst page by
 .Tn EECS ,
 and the file foo.c to be printed.
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index 89d2a598b4d9..9c170a378742 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -82,7 +82,7 @@ is useful only to the super-user.
 .It Ar job\ \&#
 A user may dequeue an individual job by specifying its job number.
 This number may be obtained from the
-.Xr lpq  1
+.Xr lpq 1
 program, e.g.\&
 .Pp
 .Bd -literal -offset indent
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 1e30a59ab529..38d1dfb92283 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -325,7 +325,8 @@ scope of multicast datagrams.
 (The TTL of forwarded packets is only compared
 to the threshold, it is not decremented by the threshold.
 Every multicast
-router decrements the TTL by exactly 1.)  The default threshold is 1.
+router decrements the TTL by exactly 1.)
+The default threshold is 1.
 .Pp
 In general, all multicast routers
 connected to a particular subnet or tunnel should
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index c3c525e08480..59a34fa2b93e 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -128,7 +128,7 @@ Make some errorconditions non-fatal warnings.
 Don't descend below mount points in the file hierarchy.
 .It Fl f Ar file
 Read the specification from
-.Ar file  ,
+.Ar file ,
 instead of from the standard input.
 .Pp
 If this option is specified twice, the two specifications are compared
@@ -150,7 +150,7 @@ Use the ``type'' keyword plus the specified (whitespace or comma separated)
 instead of the current set of keywords.
 .It Fl p Ar path
 Use the file hierarchy rooted in
-.Ar path  ,
+.Ar path ,
 instead of the current directory.
 .It Fl s Ar seed
 Display a single checksum to the standard error output that represents all
diff --git a/usr.sbin/ntp/doc/ntp-genkeys.8 b/usr.sbin/ntp/doc/ntp-genkeys.8
index 2b3bdd82542a..c5c41ddae4a4 100644
--- a/usr.sbin/ntp/doc/ntp-genkeys.8
+++ b/usr.sbin/ntp/doc/ntp-genkeys.8
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August  2, 2001
+.Dd August 2, 2001
 .Dt NTP_GENKEYS 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index 7c5123c79a98..37a61beb85da 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -381,8 +381,8 @@ using the
 or
 .Cm autokey
 subcommands on the
-.Ic peer  ,
-.Ic server  ,
+.Ic peer ,
+.Ic server ,
 .Ic broadcast
 and
 .Ic manycastclient
@@ -462,7 +462,7 @@ The servers and clients involved must
 agree on the key and key identifier to authenticate their messages.
 Keys and related information are specified in a key file, usually
 called
-.Pa ntp.keys  ,
+.Pa ntp.keys ,
 which should be exchanged and stored
 using secure procedures beyond the scope of the NTP protocol
 itself.
@@ -486,7 +486,7 @@ command before use.
 This allows, for instance, the
 installation of possibly several batches of keys and then
 activating or deactivating each batch remotely using
-.Xr ntpdc 8  .
+.Xr ntpdc 8 .
 This also provides a revocation capability that can
 be used if a key becomes compromised.
 The
@@ -841,7 +841,7 @@ Specifies the key identifier to use with the
 .Xr ntpdc 8
 utility program, which uses a
 proprietary protocol specific to this implementation of
-.Xr ntpd 8  .
+.Xr ntpd 8 .
 The
 .Ar key
 argument is a key identifier
@@ -1150,9 +1150,9 @@ number.
 This number is taken to be the number of seconds the server
 is running at the start of the corresponding 24-hour period.
 Information is only written to a file generation by specifying
-.Ic enable  ;
+.Ic enable ;
 output is prevented by specifying
-.Ic disable  .
+.Ic disable .
 .El
 .It Cm link \&| Cm nolink
 It is convenient to be able to access the current element of a
@@ -1351,7 +1351,7 @@ programs
 are not subject to these limits.
 A history of clients is kept using
 the monitoring capability of
-.Xr ntpd 8  .
+.Xr ntpd 8 .
 Thus, monitoring is
 always active as long as there is a restriction entry with the
 .Cm limited
@@ -1479,7 +1479,7 @@ clock, where the
 argument in that command
 is the clock address.
 The
-.Cm key  ,
+.Cm key ,
 .Cm version
 and
 .Cm ttl
@@ -1765,7 +1765,7 @@ When enabled, this is identical to the
 .Ic broadcastclient
 command.
 The default for this flag is
-.Ic disable  .
+.Ic disable .
 .It Cm calibrate
 Enables the calibration facility, which automatically adjusts
 the
@@ -1778,7 +1778,7 @@ See the
 page
 for further information.
 The default for this flag is
-.Ic disable  .
+.Ic disable .
 .It Cm kernel
 Enables the precision-time kernel support for the
 .Xr adjtime 2
@@ -1791,7 +1791,7 @@ It is provided primarily so that this support
 can be disabled during kernel development.
 The default for this
 flag is
-.Ic enable  .
+.Ic enable .
 .It Cm monitor
 Enables the monitoring facility.
 See the
@@ -1802,7 +1802,7 @@ and the
 command or further information.
 The
 default for this flag is
-.Ic enable  .
+.Ic enable .
 .It Cm ntp
 Enables the server to adjust its local clock by means of NTP.
 If disabled, the local clock free-runs at its intrinsic time and
@@ -1818,14 +1818,14 @@ See the
 page for further
 information.
 The default for this flag is
-.Ic enable  .
+.Ic enable .
 .It Cm stats
 Enables the statistics facility.
 See the
 .Qq "Monitoring Options"
 page for further information.
 The default for this flag is
-.Ic enable  .
+.Ic enable .
 .El
 .It Ic logconfig Ar configkeyword
 This command controls the amount and type of output written to
diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8
index 0f5646762ce2..14457c7bfd7c 100644
--- a/usr.sbin/ntp/doc/ntpd.8
+++ b/usr.sbin/ntp/doc/ntpd.8
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August  2, 2001
+.Dd August 2, 2001
 .Dt NTPD 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/ntp/doc/ntpdc.8 b/usr.sbin/ntp/doc/ntpdc.8
index e04020c7013e..d371a3271bc5 100644
--- a/usr.sbin/ntp/doc/ntpdc.8
+++ b/usr.sbin/ntp/doc/ntpdc.8
@@ -352,7 +352,7 @@ and
 configuration commands, respectively.
 These are
 the
-.Cm auth  ,
+.Cm auth ,
 .Cm bclient ,
 .Cm monitor ,
 .Cm pll ,
@@ -559,10 +559,10 @@ These commands operate in the same way as the
 and
 .Ic disable
 configuration file commands of
-.Xr ntpd 8  .
+.Xr ntpd 8 .
 Following is a description of the flags.
 Note that only the
-.Cm auth  ,
+.Cm auth ,
 .Cm bclient ,
 .Cm monitor ,
 .Cm pll ,
@@ -651,7 +651,7 @@ flag.
 This command operates in the same way as the
 .Ic restrict
 configuration file commands of
-.Xr ntpd 8  .
+.Xr ntpd 8 .
 .It Xo Ic unrestrict Ar address Ar mask
 .Ar flag ...
 .Xc
@@ -677,7 +677,7 @@ and
 .Ic untrustedkey
 configuration file
 commands of
-.Xr ntpd 8  .
+.Xr ntpd 8 .
 .It Ic authinfo
 Returns information concerning the authentication module,
 including known keys and counts of encryptions and decryptions
diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8
index 266dfec996d4..4c0d7ca9649e 100644
--- a/usr.sbin/ntp/doc/ntpq.8
+++ b/usr.sbin/ntp/doc/ntpq.8
@@ -202,7 +202,7 @@ Variables which
 .Nm
 thinks should have a decodable value but didn't are
 marked with a trailing
-.Ql \&?  .
+.Ql \&? .
 .It Xo Ic debug
 .Cm more |
 .Cm less |
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 08bd70abfcba..2efb7b81c3b0 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -227,7 +227,7 @@ Thus you may
 extract files directly from their anonymous ftp locations (e.g.\&
 .Nm
 .Li ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/shells/bash-1.14.7.tbz ) .
-Note:  If you wish to use
+Note: If you wish to use
 .Bf -emphasis
 passive mode
 .Ef
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index b8f5259adaaf..a212051b533d 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -205,7 +205,7 @@ for
 .Xr mktemp 3
 to fill in with a unique ID.
 .Bd -ragged -offset indent -compact
-Note:  This should really not be necessary with
+Note: This should really not be necessary with
 .Nm ,
 since very little information is extracted from each package
 and one would have to have a very small
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 382e241e0fb6..8ec5a513403d 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -127,7 +127,7 @@ The next column is
 the total space available in the partition.
 The
 .Ar Used
-column indicates the total blocks used so far;  the
+column indicates the total blocks used so far; the
 .Ar Available
 column indicates how much space is remaining on each partition.
 The
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index e708bbb0fe33..9a68698c1951 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -285,7 +285,7 @@ to allocate
 blocks of available free space to a new
 .Fx
 partition.
-Default:  Interactive mode.
+Default: Interactive mode.
 .It bootManager
 is set to one of
 .Ar boot
@@ -386,7 +386,7 @@ variable to request that the disk label editor use an interactive dialog
 to partition the disk instead of using variables to explicitly layout the
 disk as described above.
 .Pp
-Note:  No file system data is actually written to disk until an
+Note: No file system data is actually written to disk until an
 explicit call to
 .Ar diskLabelCommit
 is made.
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index 3bac6592c90d..56ef53053bfb 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -125,7 +125,7 @@ with space) are ignored.
 Other lines must start with a
 .Ar loginname
 but the remaining arguments can be whatever is appropriate for the
-.Pa  slip.login
+.Pa slip.login
 file that will be executed for that name.
 Arguments are separated by white space and follow normal
 .Xr sh 1
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index e708bbb0fe33..9a68698c1951 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -285,7 +285,7 @@ to allocate
 blocks of available free space to a new
 .Fx
 partition.
-Default:  Interactive mode.
+Default: Interactive mode.
 .It bootManager
 is set to one of
 .Ar boot
@@ -386,7 +386,7 @@ variable to request that the disk label editor use an interactive dialog
 to partition the disk instead of using variables to explicitly layout the
 disk as described above.
 .Pp
-Note:  No file system data is actually written to disk until an
+Note: No file system data is actually written to disk until an
 explicit call to
 .Ar diskLabelCommit
 is made.
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 826c662ae06e..0cd7501e2134 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -361,7 +361,8 @@ redirection can occur.
 .Xr stdio 3
 buffered output from the invoked command can cause additional delays,
 or even lost output data in case a logging subprocess exited with a
-signal.)  The command itself runs with
+signal.)
+The command itself runs with
 .Em stdout
 and
 .Em stderr
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index da0ceb9dde17..a5902f2415ca 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -35,7 +35,7 @@ The options are as follows:
 Reconnect on close.
 If the tty observed by
 .Nm
-is closed,  automatically reattach to the same tty.
+is closed, automatically reattach to the same tty.
 If this option is not specified,
 .Nm
 will request a new tty if running in interactive mode or exit if running