diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 0ce507f621dd..0ab034e6bcf4 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -236,8 +236,7 @@ element address is not normally used with this driver.  It is reported
 for diagnostic purposes only.
 .It Fl a
 Print all additional information (as in
-.Fl vVsSba
-).
+.Fl vVsSba ) .
 .El
 .Pp
 The status bits are defined as follows:
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 50df1038e4cb..12a4e5dcbe36 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -433,7 +433,7 @@ However, most commands accept a print suffix, which is any of
 .Em p
 (print),
 .Em l
-(list) ,
+(list),
 or
 .Em n
 (enumerate),
@@ -570,8 +570,8 @@ Mark a line with a lower case letter
 The  line can then be addressed as
 .Em 'lc
 (i.e., a single quote followed by
-.Em lc
-) in subsequent commands.  The mark is not cleared until the line is
+.Em lc )
+in subsequent commands.  The mark is not cleared until the line is
 deleted or otherwise modified.
 .It (.,.)l
 Print the addressed lines unambiguously.
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index cf3849fd216c..d9c80f763308 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -485,9 +485,8 @@ Link files.
 (The letter ell).
 In the
 .Em copy
-mode (
-.Fl r
-.Fl w ) ,
+mode
+.Pq Fl r w ,
 hard links are made between the source and destination file hierarchies
 whenever possible.
 .It Fl n
@@ -676,8 +675,8 @@ Where <ls -l listing> is the output format specified by the
 utility when used with the
 .Fl l
 option.
-Otherwise for all the other operational modes (
-.Em read , write ,
+Otherwise for all the other operational modes
+.Em ( read , write ,
 and
 .Em copy ) ,
 pathnames are written and flushed to
@@ -966,8 +965,8 @@ option, except that the modification time is checked using the
 pathname created after all the file name modifications have completed.
 .El
 .Pp
-The options that operate on the names of files or archive members (
-.Fl c ,
+The options that operate on the names of files or archive members
+.Fl ( c ,
 .Fl i ,
 .Fl n ,
 .Fl s ,
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 3720fbdaf5f6..6c947ba02e4f 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -464,8 +464,8 @@ The terminal size is recorded as having
 .Ar number
 rows.
 .It Cm dec
-Set modes suitable for users of Digital Equipment Corporation systems (
-.Dv ERASE ,
+Set modes suitable for users of Digital Equipment Corporation systems
+.Dv ( ERASE ,
 .Dv KILL ,
 and
 .Dv INTR
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 6dca2bca21e1..1c7622c9ce2f 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -227,7 +227,7 @@ The
 .Em d Ns 'th
 day (0 \*(Le
 .Em d
-\*(Le 6 )
+\*(Le 6)
 of week
 .Em n
 of month
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 5b6070e1487b..5b74325bb0f1 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -56,11 +56,11 @@ LDT.
 will set a list of i386 descriptors for the current process in its
 LDT.
 Both routines accept a starting selector number
-.Fa start_sel
-, an array of memory that
+.Fa start_sel ,
+an array of memory that
 will contain the descriptors to be set or returned
-.Fa descs
-, and the number of entries to set or return
+.Fa descs ,
+and the number of entries to set or return
 .Fa num_sels .
 .Pp
 The argument
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index 2771e9bcf74d..8f13af701502 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -230,7 +230,7 @@ tokens if you wish to override the
 on a per-process basis.  This is similar to the
 .Em search
 command in the configuration file.
-Another environment variable (
+Another environment variable
 .Dq Ev RES_OPTIONS
 can be set to
 override certain internal resolver options which are otherwise
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index f2c516f9da5b..65ad98f2c859 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -153,8 +153,8 @@ Inverse of
 is an interface to the keyserver daemon, which is associated
 with
 .Tn RPC Ns 's
-secure authentication system (
-.Tn DES
+secure authentication system
+.Tn ( DES
 authentication).
 User programs rarely need to call it, or its associated routines
 .Fn key_encryptsession ,
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index 347795cc7540..9c2a7b1b462b 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -96,7 +96,7 @@ the value of the new descriptor
 .Fa newd
 is specified.  If this descriptor is already in use and
 .Fa oldd
-!=
+\*(Ne
 .Fa newd ,
 the descriptor is first deallocated as if a
 .Xr close 2
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index 1f9644793c25..80d7f76d3da7 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -46,8 +46,8 @@ See
 .Xr wait 2 .
 .It RFFDG
 If set, the invoker's file descriptor table (see
-.Xr intro 2
-) is copied; otherwise the two processes share a
+.Xr intro 2 )
+is copied; otherwise the two processes share a
 single table.
 .It RFCFDG
 If set, the new process starts with a clean file descriptor table.
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 9837eb5757a2..d888bfb91bf3 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -170,8 +170,8 @@ The default size of
 is currently 1024.
 In order to accommodate programs which might potentially
 use a larger number of open files with
-.Fn select
-, it is possible
+.Fn select ,
+it is possible
 to increase this size by having the program define
 .Dv FD_SETSIZE
 before the inclusion of any header which includes
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 00a9b23a7672..df920da1899b 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -413,10 +413,10 @@ them to a dummy variable in the arg list.
 The seek field type
 .Fa s
 permits you to skip over data.
-This seeks to an absolute position (
-.Fa s3 )
-or a relative position (
-.Fa s+3 )
+This seeks to an absolute position
+.Pq Fa s3
+or a relative position
+.Pq Fa s+3
 in the data, based on whether or not the presence of the '+' sign.
 The seek value can be specified as
 .Fa v
diff --git a/lib/libm/common_source/asin.3 b/lib/libm/common_source/asin.3
index fe6184b9d58f..a1571abac47e 100644
--- a/lib/libm/common_source/asin.3
+++ b/lib/libm/common_source/asin.3
@@ -62,7 +62,7 @@ function returns the arc sine in the range
 radians.
 On the
 .Tn VAX ,
-and Tahoe ,
+and Tahoe,
 if:
 .Bd -unfilled -offset indent
 .Pf \&| Ns Ar x Ns \&| > 1
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index cdd68e07e9fa..7add8c26c5dc 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -406,7 +406,8 @@ Passing a in-memory bitmap to this function results in error.
 .Fn VGLBlankDisplay
 blank the display if the argument
 .Va blank
-!= 0. This can be done to shut off the screen during display updates that
+\*(Ne 0.
+This can be done to shut off the screen during display updates that
 the user should first see when it's done.
 .Ss Program termination and signal processing
 It is important to call
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index 6515fbdfc47a..3bb80611b02b 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -67,7 +67,7 @@ functions return the arc sine in the range
 radians.
 On the
 .Tn VAX ,
-and Tahoe ,
+and Tahoe,
 if:
 .Bd -unfilled -offset indent
 .Pf \&| Ns Ar x Ns \&| > 1
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 801be3bf69eb..98e1f245f277 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -193,8 +193,8 @@ A
 .Fl index No = Sy file
 .Sm on
 option can be used to specify a file whose handle will be returned if
-a directory is looked up using the public filehandle (
-.Tn WebNFS ) .
+a directory is looked up using the public filehandle
+.Pq Tn WebNFS .
 This is to mimic the behavior of URLs.
 If no
 .Fl index
diff --git a/secure/lib/libcipher/cipher.3 b/secure/lib/libcipher/cipher.3
index 3c5d42d0bed0..deddac94ceff 100644
--- a/secure/lib/libcipher/cipher.3
+++ b/secure/lib/libcipher/cipher.3
@@ -105,8 +105,7 @@ iterations of
 and stores the 64-bit result in the 8 characters at
 .Fa out
 (which may be the same as
-.Fa in
-).
+.Fa in ) .
 The
 .Fa salt
 introduces disorder in the
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index da818dae7ebd..fd51ee501e8a 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -185,8 +185,8 @@ changer and converts it to an array of \fBchanger_element_status\fR
 structures.
 .Pp
 With each call to
-.Dv CHIOGSTATUS
-, the status of one or more elements of one type may be queried.
+.Dv CHIOGSTATUS ,
+the status of one or more elements of one type may be queried.
 .Pp
 The application passes a changer_element_status_request structure to the
 .Nm
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index 48101bc5cea6..5749217eab35 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -77,8 +77,7 @@ must be found after the IP address.
 If an interface name is found,
 that interface will be used and the value of the IP address will be
 ignored (other than the fact that it is not
-.Dv INADDR_ANY
-).
+.Dv INADDR_ANY ) .
 This is to indicate on which interface the packet ``arrived.''
 .Pp
 Normally, packets read as incoming should be written as incoming;
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index e5f8e0a1bb49..1868eb61345b 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -386,8 +386,8 @@ will be the first byte of the socket address structure.
 .Pp
 If the socket address structure contains an IPv6 address (e.g., the
 sin6_family member is
-.Dv AF_INET6
-), then the node identified by that
+.Dv AF_INET6 ) ,
+then the node identified by that
 address must be a neighbor of the sending host.
 If that address
 equals the destination IPv6 address of the datagram, then this is
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 748f1deee66e..fc40de17b9ac 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -14,8 +14,7 @@ To enable this protocol layer, add
 .Dl options NATM
 to your kernel configuration file and re-make the kernel (don't forget
 to do
-.Dq make clean
-).
+.Dq make clean ) .
 .Sh NATM API
 The NATM layer uses a
 .Dv struct sockaddr_natm
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index f009977188fb..c6b77fb9ac72 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -670,13 +670,13 @@ node name
 Optional globally unique name, null terminated string. If there
 is a value in here, it is the name of the node.
 .Pp
-if (
-.Fn NG_NODE_NAME "node"
+if
+.Fn ( NG_NODE_NAME "node"
 [0]) ....
 .Pp
 if (strncmp(
-.Fn NG_NODE_NAME "node"
-, "fred", NG_NODELEN)) ...
+.Fn NG_NODE_NAME "node" ,
+"fred", NG_NODELEN)) ...
 .Pp
 .It
 A node dependent opaque cookie
@@ -1238,8 +1238,7 @@ Refer to the section at the end of this man page for more nodes types.
 .Sh NOTES
 Whether a named node exists can be checked by trying to send a control message
 to it (e.g.,
-.Dv NGM_NODEINFO
-).
+.Dv NGM_NODEINFO ) .
 If it does not exist,
 .Er ENOENT
 will be returned.
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 8997563f466e..153988669b8d 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -50,8 +50,8 @@ node type performs the frame relay LMI protocol. It supports
 the ITU Annex A, ANSI Annex D, and Group-of-four LMI types.
 It also supports auto-detection of the LMI type.
 .Pp
-To enable a specific LMI type, connect the corresponding hook (
-.Dv annexA ,
+To enable a specific LMI type, connect the corresponding hook
+.Dv ( annexA ,
 .Dv annexD ,
 or
 .Dv group4 ")"
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index ca685e48d228..f5f6397e076b 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -263,16 +263,15 @@ the mouse.
 This option disables the ``debug'' key (by default, it is
 .Dv Alt-Esc ,
 or
-.Dv Ctl-PrintScreen
-).
+.Dv Ctl-PrintScreen ) .
 It will prevent the user from
 entering the kernel debugger DDB by pressing the key combination.
 DDB will still be invoked when the kernel panics or hits a break point
 if it is included in the kernel.
 .It Dv SC_DISABLE_REBOOT
 This option disables the ``reboot'' key (by default, it is
-.Dv Ctl-Alt-Del
-), so that the casual user may not accidentally reboot the system.
+.Dv Ctl-Alt-Del ) ,
+so that the casual user may not accidentally reboot the system.
 .It Dv SC_HISTORY_SIZE=N
 Sets the size of back scroll buffer to
 .Fa N
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 5a30f86f82f2..4c8c69e2b3a1 100644
--- a/share/man/man4/udp.4
+++ b/share/man/man4/udp.4
@@ -149,8 +149,7 @@ listening, log the connection attempt (disabled by default).
 When a datagram is received on a port where there is no socket
 listening, do not return an ICMP port unreachable message.
 (Disabled by default.  See
-.Xr blackhole 4
-)
+.Xr blackhole 4 . )
 .El
 .Sh SEE ALSO
 .Xr getsockopt 2 ,
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 44a296f05eb2..2639d70f6309 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -175,8 +175,7 @@ All entries are case-insensitive.
 The default criteria is to return on
 .Dq success ,
 and continue on anything else (i.e,
-.Li [success=return notfound=continue unavail=continue tryagain=continue]
-).
+.Li "[success=return notfound=continue unavail=continue tryagain=continue]" ) .
 .Ss Compat mode: +/- syntax
 In historical multi-source implementations, the
 .Sq +
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 26a4cce64871..3142194c2971 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -122,8 +122,8 @@ can only be written when the process is stopped.
 This is a read-only file containing the process current and maximum
 limits.
 Each line is of the format
-.Ar rlimit current max
-, with -1
+.Ar rlimit current max ,
+with -1
 indicating infinity.
 .It Pa status
 The process status.
diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index 35d8b14fe25d..1dc1cb4a3111 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -65,9 +65,8 @@ executes the shell file
 .Dq Pa MAKEDEV.local .
 .Pp
 The Alpha supports the following devices.
-Where a device name is followed by a hash sign (
-.Dq #
-),
+Where a device name is followed by a hash sign
+.Pq Dq # ,
 the hash sign
 must be replaced by a unit number.
 .Bl -tag -width indent
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index a27b857ffd71..4d2288412678 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -64,9 +64,9 @@ executes the shell file
 .Dq Pa MAKEDEV.local .
 .Pp
 The i386 supports the following devices.
-Where a device name is followed by a hash sign (
-.Dq #
-), the hash sign
+Where a device name is followed by a hash sign
+.Pq Dq # ,
+the hash sign
 must be replaced by a unit number.
 .Bl -tag -width indent
 .It std
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index cdbdd360f008..f0c06fb51f99 100644
--- a/share/man/man9/VOP_ADVLOCK.9
+++ b/share/man/man9/VOP_ADVLOCK.9
@@ -50,8 +50,7 @@ the vnode being manipulated
 the id token which is changing the lock
 .It Ar op
 the operation to perform (see
-.Xr fcntl 2
-)
+.Xr fcntl 2 )
 .It Ar fl
 description of the lock
 .It Ar flags
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 6e9e93edf326..4f61f01d2b91 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -36,11 +36,11 @@
 .Sh DESCRIPTION
 The
 .Nm
-device driver provides a read only interface for CDROM drives (
-.Tn SCSI
+device driver provides a read only interface for CDROM drives
+.Tn ( SCSI
 type 5)
-and WORM drives (
-.Tn SCSI
+and WORM drives
+.Tn ( SCSI
 type 4)
 that support CDROM type commands.
 Some drives don't behave as the driver expects.  See the section
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index f0667faa00e9..730f925ae8d5 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -776,9 +776,9 @@ word set, Providing the Locals Extensions word set, Providing the
 Memory-Allocation Extensions word set, Providing
 .Ef
 .Bf Li
-\&.s ,
+\&.s,
 bye, forget, see, words,
-\&[if] ,
+\&[if],
 \&[else]
 .Ef
 .Em and
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 5ec1a01c2e73..f674ad9179b1 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -748,12 +748,12 @@ when supplied the
 switch, this support can be added by defining an environment variable
 .Ev X11BASE
 which points to the installed X Window System (normally
-.Pa /usr/X11R6
-) and then typing
+.Pa /usr/X11R6 )
+and then typing
 .Ic make install
 in the source directory (normally
-.Pa /usr/src/usr.bin/doscmd
-).  For this to work, the X programmer's kit must have been installed.
+.Pa /usr/src/usr.bin/doscmd ) .
+For this to work, the X programmer's kit must have been installed.
 .Sh AUTHORS
 .An Pace Willisson ,
 .An Paul Borman
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index e9ebaae259e7..cfce9a6d2422 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -89,8 +89,7 @@ This option exists solely for conformance with
 .It Fl s
 Display an entry for each specified file.
 (Equivalent to
-.Fl d
-0 )
+.Fl d Li 0 )
 .It Fl d Ar depth
 Display an entry for all files and directories
 .Ar depth
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 11a70b50288a..9c1d60a98e3a 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -15,8 +15,7 @@ is used to break up options in command lines for easy parsing by
 shell procedures, and to check for legal options.
 .Ar Optstring
 is a string of recognized option letters (see
-.Xr getopt 3
-);
+.Xr getopt 3 ) ;
 if a letter is followed by a colon, the option
 is expected to have an argument which may or may not be
 separated from it by white space.
diff --git a/usr.bin/mk_cmds/mk_cmds.1 b/usr.bin/mk_cmds/mk_cmds.1
index 13e6b8ebbd84..abf439fd3417 100644
--- a/usr.bin/mk_cmds/mk_cmds.1
+++ b/usr.bin/mk_cmds/mk_cmds.1
@@ -53,8 +53,7 @@ keyword ss_command_name,
 .Qq description_of_command ,
 command_name,
 (dont_option
-.Op ", dont_option"
-);
+.Op , dont_option ) ;
 .Pp
 end;
 .Pp
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index cb9db05697d0..7e09e3f9e27b 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -129,8 +129,7 @@ Only allowed for the super-user.
 The
 .Fl l
 (or
-.Fl
-)
+.Fl )
 and
 .Fl m
 options are mutually exclusive; the last one specified
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index d749559dacac..0419dca69fc6 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -109,8 +109,8 @@ code appears in the string), it won't try to translate it.
 String capabilities that don't take parameters won't be translated.
 .Pp
 Termcap options: the following options are available when translating termcap
-entries (
-.Fl c
+entries
+.Fl ( c
 option is used).
 .Bl -tag -width indent
 .It Fl d
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index ef4e31fa6b99..c26485b718c1 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -103,7 +103,7 @@ The options are:
 .It Fl
 forces input to be taken from standard input (default if
 .Fl f
-is specified )
+is specified)
 .It Fl W
 forces output to the (wide) Versatec printer rather than the (narrow)
 Varian
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index cb2647efe6d8..af20a2f4f61e 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -36,8 +36,7 @@ suspends the system by controlling APM.
 The following options are available for
 .Nm
 (no options are available for
-.Nm zzz
-).
+.Nm zzz ) .
 If no options are specified,
 .Nm
 displays information and current status of APM in verbose mode.
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index eca3fefc5312..21136bcd1f8f 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -208,11 +208,14 @@ file option
 .Sh INTERACTION WITH THE KERNEL
 .Nm Isdnd
 communicates with the kernel part of isdn4bsd by receiving status and
-event messages (
-.Xr read 2
-from device /dev/i4b ) and by transmitting commands and responses (
-.Xr ioctl 2
-from device /dev/i4b ).
+event messages
+.Xr ( read 2
+from device
+.Pa /dev/i4b )
+and by transmitting commands and responses
+.Xr ( ioctl 2
+from device
+.Pa /dev/i4b ) .
 .Pp
 The messages and message parameters are documented in the include
 file
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index 9191b0156c9f..4ede33ec813c 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -156,8 +156,7 @@ This keyword is used to specify the email address of someone to notify
 in case of a fatal error exit of
 .Nm .
 (See also keyword
-.Em mailer
-).
+.Em mailer ) .
 (optional)
 .It Li monitor-allowed
 If this parameter is set to
@@ -259,8 +258,7 @@ This keyword is optional; if not specified the process priority of
 .Nm isdnd
 is not touched in any way.
 ( See also
-.Xr rtprio 1
-).
+.Xr rtprio 1 ) .
 This keyword is only available if
 .Nm
 was compiled with -DUSE_RTPRIO.
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 25d0163fe918..a0b35892c211 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -69,8 +69,7 @@ interfaces.
 .Pp
 The driver optionally (when compiled with the IPR_VJ option) provides Van
 Jacobsen header compression, under control of the link0 and link1 options to
-.Xr ifconfig 8
-:
+.Xr ifconfig 8 :
 .Pp
 .Bl -tag -width 15n -offset indent -compact
 .It link0
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index 801be3bf69eb..98e1f245f277 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -193,8 +193,8 @@ A
 .Fl index No = Sy file
 .Sm on
 option can be used to specify a file whose handle will be returned if
-a directory is looked up using the public filehandle (
-.Tn WebNFS ) .
+a directory is looked up using the public filehandle
+.Pq Tn WebNFS .
 This is to mimic the behavior of URLs.
 If no
 .Fl index
diff --git a/usr.sbin/ntp/doc/ntptrace.8 b/usr.sbin/ntp/doc/ntptrace.8
index 1c489d560e5b..c76288f746a2 100644
--- a/usr.sbin/ntp/doc/ntptrace.8
+++ b/usr.sbin/ntp/doc/ntptrace.8
@@ -38,7 +38,7 @@ the time offset between that host and the local host
 this is why it is not always zero for
 .Dq localhost ) ,
 the host
-synchronization distance ,
+synchronization distance,
 and (only for stratum-1 servers) the reference clock ID.  All times
 are given in seconds.
 Note that the stratum is the server hop count to the primary source,
diff --git a/usr.sbin/pcvt/kcon/kcon.1 b/usr.sbin/pcvt/kcon/kcon.1
index 6047ae06ce25..5d8788f53703 100644
--- a/usr.sbin/pcvt/kcon/kcon.1
+++ b/usr.sbin/pcvt/kcon/kcon.1
@@ -82,11 +82,11 @@ Reset the Keyboard.
 .It Fl s
 Displays the current settings of the rate and delay values.
 .It Fl t Ar +/-
-Specify this option to enable (
-.Ar +
-) or disable (
-.Ar -
-) the repetition of keys.
+Specify this option to enable
+.Pq Ar +
+or disable
+.Pq Ar -
+the repetition of keys.
 .It Fl x
 Switches display of control codes to hexadecimal in the listing of the current map.
 To be used in conjunction with the
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index ee682588089d..76a4c0f9657f 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -182,7 +182,7 @@ screen saver.
 NOTE: the
 .Fl t
 option is only available if screen saver support has been compiled into
-the driver !
+the driver!
 .It Fl 1
 Sets 132 columns mode
 (only available on VGA adaptors).
diff --git a/usr.sbin/prefix/prefix.8 b/usr.sbin/prefix/prefix.8
index e22e6d02918a..aa4aada4e77a 100644
--- a/usr.sbin/prefix/prefix.8
+++ b/usr.sbin/prefix/prefix.8
@@ -144,8 +144,8 @@ command, as decimal bit number.
 Specify the midium part of
 .Ar use_prefix
 just next to the starting part specified by
-.Ar use_prefix_uselen
-, as decimal bit number.
+.Ar use_prefix_uselen ,
+as decimal bit number.
 Contiguous bits part in the same bit position of an existent prefix
 matched with
 .Ar match_prefix
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index 6b7324da8b1c..e9fb46f7bdc0 100644
--- a/usr.sbin/rrenumd/rrenumd.conf.5
+++ b/usr.sbin/rrenumd/rrenumd.conf.5
@@ -191,8 +191,8 @@ command, as decimal bit number.
 Specify the medium part of
 .Ar use-prefix-val
 just next to the starting part specified by
-.Ar use-prefix-len
-, as decimal bit number.
+.Ar use-prefix-len ,
+as decimal bit number.
 Contiguous bits part in the same bit position of an existent prefix
 matched with
 .Ar match-prefix-val
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 3e5ceecf88f2..2141c0a0ef07 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -71,8 +71,7 @@ Note that if you use spaces as separators, your
 might be incompatible with other Unices or Unix-like systems.
 This functionality was added for the ease of configuration
 (e.g. it is possible to cut-and-paste into
-.Pa syslog.conf
-),
+.Pa syslog.conf ) ,
 and to avoid possible mistakes.
 This change however preserves
 backwards compatibility with the old style of the
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 2b17f9f02021..b79c453b9d83 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.1
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1
@@ -193,8 +193,8 @@ specifies the times you think it does.  If one of
 or
 .Fl t
 has been specified then the times are dumped in the corresponding
-format; otherwise, raw format (
-.Fl R )
+format; otherwise, raw format
+.Pq Fl R
 is used.
 .It Fl R
 Dump the timestamps of the first and last packets in each input file
diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8
index 717b4046dbcc..cfbd4b330c6d 100644
--- a/usr.sbin/wlconfig/wlconfig.8
+++ b/usr.sbin/wlconfig/wlconfig.8
@@ -24,8 +24,8 @@ strength cache which may have been compiled into the driver.
 The
 .Ar ifname
 parameter specifies the wavelan interface name (eg.
-.Pa wl0
-).  If no other arguments are supplied, the current contents of the PSA
+.Pa wl0 ) .
+If no other arguments are supplied, the current contents of the PSA
 are interpreted and displayed.
 .Pp
 The
@@ -91,12 +91,12 @@ will be configured, but will not function.  The
 program should then be used to reconfigure the card to a sensible
 value.
 .Sh EXAMPLES
-Set the NWID to 0x1234 :
+Set the NWID to 0x1234:
 .Bd -literal -offset
 # wlconfig wl0 nwid 0x1234
 .Ed
 .Pp
-Show the current settings :
+Show the current settings:
 .Bd -literal -offset
 # wlconfig wl0
 Board type            : ISA
@@ -122,7 +122,7 @@ CRC-16                : 0x3c26
 CRC status            : OK
 .Ed
 .Pp
-Print a scaled version of the signal strength cache :
+Print a scaled version of the signal strength cache:
 .Bd -literal -offset
 # wlconfig wl0 cache scale
 .Ed
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 4dd2b106adac..5ed948dde276 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -286,8 +286,8 @@ you can easily recompile
 .Nm
 with them.
 This allows the administrator to use the tcpwrapper
-configuration files (
-.Pa /etc/hosts.allow
+configuration files
+.Pa ( /etc/hosts.allow
 and
 .Pa /etc/hosts.deny )
 for access control instead of