mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

119 files changed, 652 insertions, 756 deletions

diff --git a/bin/date/date.1 b/bin/date/date.1
index a8a1203..4bbb990 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -160,13 +160,11 @@ The date can be adjusted as many times as required using these flags.
 Flags are processed in the order given.
 .Pp
 When setting values
-.Pq rather than adjusting them ,
+(rather than adjusting them),
 seconds are in the range 0-59, minutes are in the range 0-59, hours are
 in the range 1-12, month days are in the range 1-31, week days are in the
-range 0-6
-.Pq Sun-Sat ,
-months are in the range 1-12
-.Pq Jan-Dec
+range 0-6 (Sun-Sat),
+months are in the range 1-12 (Jan-Dec)
 and years are in the range 80-38 or 1980-2038.
 .Pp
 If
@@ -185,11 +183,11 @@ must be used to specify which part of the date is to be adjusted.
 The week day or month may be specified using a name rather than a
 number.
 If a name is used with the plus
-.Pq or minus
+(or minus)
 sign, the date will be put forwards
-.Pq or backwards
+(or backwards)
 to the next
-.Pq previous
+(previous)
 date that matches the given week day or month.
 This will not adjust the date,
 if the given week day or month is the same as the current one.
@@ -207,13 +205,11 @@ the clock goes back at 02:00 to 01:00, using
 will be necessary to reach October 29, 2:30.
 .Pp
 When the date is adjusted to a specific value that doesn't actually exist
-.Po
-for example March 26, 1:30 BST 2000 in the Europe/London timezone
-.Pc ,
+(for example March 26, 1:30 BST 2000 in the Europe/London timezone),
 the date will be silently adjusted forwards in units of one hour until it
 reaches a valid time.
 When the date is adjusted to a specific value that occurs twice
-.Pq for example October 29, 1:30 2000 ,
+(for example October 29, 1:30 2000),
 the resulting timezone will be set so that the date matches the earlier of
 the two times.
 .Pp
@@ -242,11 +238,11 @@ The canonical representation for setting the date and time is:
 .Bl -tag -width Ds -compact -offset indent
 .It Ar cc
 Century
-.Pq either 19 or 20
+(either 19 or 20)
 prepended to the abbreviated year.
 .It Ar yy
 Year in abbreviated form
-.Pq e.g. 89 for 1989, 06 for 2006 .
+(e.g. 89 for 1989, 06 for 2006).
 .It Ar mm
 Numeric month, a number from 1 to 12.
 .It Ar dd
@@ -257,7 +253,7 @@ Hour, a number from 0 to 23.
 Minutes, a number from 0 to 59.
 .It Ar ss
 Seconds, a number from 0 to 61
-.Pq 59 plus a maximum of two leap seconds .
+(59 plus a maximum of two leap seconds).
 .El
 .Pp
 Everything but the minutes is optional.
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 0318455..ac22fb7 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -191,11 +191,11 @@ Flag variables for export when assignments are made to them.
 .It Fl b Li notify
 Enable asynchronous notification of background job
 completion.
-.Pq UNIMPLEMENTED
+(UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
 .Dq Li > .
-.Pq UNIMPLEMENTED
+(UNIMPLEMENTED)
 .It Fl E Li emacs
 Enable the builtin
 .Xr emacs 1
@@ -265,7 +265,7 @@ sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
 shell is not interactive, exit immediately.
-.Pq UNIMPLEMENTED
+(UNIMPLEMENTED)
 .It Fl V Li vi
 Enable the builtin
 .Xr vi 1
@@ -364,8 +364,7 @@ meaning of all characters except dollarsign
 backquote
 .Pq Li ` ,
 and backslash
-.Po Li \e\"
-.Pc .
+.Pq Li \e .
 The backslash inside double quotes is historically weird.
 It remains literal unless it precedes the following characters,
 which it serves to quote:
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index 5c93167..1a5acc77 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -62,11 +62,9 @@ signal is not handled specially by this implementation.
 The
 .Nm
 command will accept and honor a non-integer number of specified seconds
-.Po
-with a
+(with a
 .Ql .\&
-character as a decimal point
-.Pc .
+character as a decimal point).
 .Bf Sy
 This is a non-portable extension, and its use will nearly guarantee that
 a shell script will not execute properly on another system.
diff --git a/bin/test/test.1 b/bin/test/test.1
index cddafd5..5fee8e2 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -110,7 +110,7 @@ is nonzero.
 True if
 .Ar file
 is a named pipe
-.Po Tn FIFO Pc .
+.Pq Tn FIFO .
 .It Fl r Ar file
 True if
 .Ar file
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 992d880..9978376 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -270,7 +270,7 @@ process as needed.  This tends to improve
 performance, at the cost of reserving the memory used by the
 .Nm amd
 process
-.Pq making it unavailable for other processes .
+(making it unavailable for other processes).
 If this behavior is not desired, use the
 .Fl S
 option.
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index f86cd2d..61daf7c 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -132,7 +132,7 @@ will re-verify the validity of the user's home directory, and
 reset the cache time-counter.  The default value for
 .Ar cache-interval
 is 300 seconds 
-.Pq 5 minutes .
+(5 minutes).
 .It Fl f 
 Force fast startup.  This option tells
 .Nm
@@ -146,7 +146,7 @@ to
 .Ar group .
 Programs such as
 .Ic comsat ,
-.Pq which access the mailboxes of other users
+(which access the mailboxes of other users)
 must be setgid
 .Va HLFS_GID
 to work properly.  The default group is
@@ -174,7 +174,7 @@ sent to
 will force it to reload the maps immediately.   The default value for
 .Ar reload-interval
 is 900 seconds 
-.Pq 15 minutes .
+(15 minutes).
 .It Fl l Ar logfile
 Specify a log file to which
 .Nm
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index bb632ce..283af8c 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -112,7 +112,7 @@ specified only in the global section, it is applicable to all regular map
 sections that follow.
 .Bl -tag -width 4n
 .It Ic browsable_dirs Xo
-.Pq "string, default=no"
+(string, default=no)
 .Xc
 If 
 .Qq yes , 
@@ -143,14 +143,14 @@ will attempt to mount
 entry in that map.  This is often called a 
 .Em mount storm .
 .It Ic map_options Xo
-.Pq "string, default no options"
+(string, default no options)
 .Xc
 This option is the same as specifying map options on the command line to 
 .Nm amd ,
 such as
 .Ql cache\&:\&=all .
 .It Ic map_type Xo
-.Pq "string, default search all map types"
+(string, default search all map types)
 .Xc
 If specified, amd will initialize the map only for the type given.   
 This is useful to avoid the default map search type used by amd which 
@@ -176,7 +176,7 @@ local password files
 union maps
 .El
 .It Ic mount_type Xo
-.Pq "string, default=nfs"
+(string, default=nfs)
 .Xc
 All amd mount types default to
 .Tn NFS .
@@ -188,10 +188,10 @@ server on the map mount points, for the local host it is running on.  If
 .Qq autofs 
 is specified, amd will be an autofs server for those mount points.
 .It Ic search_path Xo
-.Pq "string, default no search path"
+(string, default no search path)
 .Xc
 This provides a 
-.Pq colon-delimited
+(colon-delimited)
 search path for file maps.  Using a search path, sites can allow for 
 local map customizations and overrides, and can distributed maps in 
 several locations as needed.
@@ -199,14 +199,14 @@ several locations as needed.
 .Ss "Parameters applicable to the global section only"
 .Bl -tag -width 4n
 .It Ic arch Xo
-.Pq "string, default to compiled in value"
+(string, default to compiled in value)
 .Xc
 Allows you to override the value of the
 .Va arch
 .Nm amd
 variable.
 .It Ic auto_dir Xo
-.Pq "string, default=/a"
+(string, default=/a)
 .Xc
 Same as the 
 .Fl a
@@ -215,7 +215,7 @@ option to
 This sets the private directory where amd will create sub-directories for its
 real mount points.
 .It Ic cache_duration Xo
-.Pq "numeric, default=300"
+(numeric, default=300)
 .Xc
 Same as the
 .Fl c
@@ -223,7 +223,7 @@ option to
 .Nm amd .
 Sets the duration in seconds that looked up map entries remain in the cache.
 .It Ic cluster Xo
-.Pq "string, default no cluster"
+(string, default no cluster)
 .Xc
 Same as the
 .Fl C
@@ -233,7 +233,7 @@ Specifies the alternate
 .Tn HP-UX
 cluster to use.
 .It Ic debug_options Xo
-.Pq "string, default no debug options"
+(string, default no debug options)
 .Xc
 Same as the 
 .Fl D
@@ -270,7 +270,7 @@ fork server
 program trace
 .It Ic info
 info service specific debugging
-.Pq hesiod, nis, etc.
+(hesiod, nis, etc.)
 .It mem
 trace memory allocations
 .It Ic mtab
@@ -285,7 +285,7 @@ full debug but no daemon
 protocol trace
 .El
 .It Ic dismount_interval Xo
-.Pq "numeric, default=120"
+(numeric, default=120)
 .Xc
 Same as the
 .Fl w
@@ -294,7 +294,7 @@ option to
 Specify, in seconds, the time between attempts to dismount file systems that
 have exceeded their cached times. 
 .It Ic fully_qualified_hosts Xo
-.Pq "string, default=no"
+(string, default=no)
 .Xc
 If
 .Qq yes ,
@@ -309,11 +309,11 @@ is used, requiring that
 .Va ${domain}
 not be null.
 .It Ic hesiod_base Xo
-.Pq "string, default=automount"
+(string, default=automount)
 .Xc
 Specify the base name for hesiod maps.
 .It Ic karch Xo
-.Pq "string, default to karch of the system"
+(string, default to karch of the system)
 .Xc
 Same as the
 .Fl k
@@ -321,14 +321,14 @@ option to
 .Nm amd .
 Allows you to override the kernel-architecture of your system.  Useful for
 example on Sun
-.Pq Sparc
+(Sparc)
 machines, where you can build one
 .Nm amd
 binary and run it on multiple machines, yet you want each one to get the
 correct 
 .Va karch
 variable set
-.Pq for example, sun4c, sun4m, sun4u, etc.
+(for example, sun4c, sun4m, sun4u, etc.)
 Note that if not
 specified,
 .Nm amd
@@ -336,23 +336,23 @@ will use
 .Xr uname 3
 to figure out the kernel architecture of the machine.
 .It Ic ldap_base Xo
-.Pq "string, default not set"
+(string, default not set)
 .Xc
 Specify the base name for LDAP.
 .It Ic ldap_cache_maxmem Xo
-.Pq "numeric, default=131072"
+(numeric, default=131072)
 .Xc
 Specify the maximum memory amd should use to cache LDAP entries.
 .It Ic ldap_cache_seconds Xo
-.Pq "numeric, default=0"
+(numeric, default=0)
 .Xc
 Specify the number of seconds to keep entries in the cache.
 .It Ic ldap_hostports Xo
-.Pq "string, default not set"
+(string, default not set)
 .Xc
 Specify LDAP-specific values such as country and organization.
 .It Ic local_domain Xo
-.Pq "string, default no sub-domain"
+(string, default no sub-domain)
 .Xc
 Same as the
 .Fl d
@@ -362,7 +362,7 @@ Specify the local domain name.  If this option is not given the domain name is
 determined from the hostname by removing the first component of the
 fully-qualified host name.
 .It Ic log_file Xo
-.Pq "string, default=/dev/stderr"
+(string, default=/dev/stderr)
 .Xc
 Same as the
 .Fl l
@@ -394,9 +394,9 @@ will log messages via
 using the
 .Ev LOG_LOCAL7
 facility
-.Pq if it exists on the system .
+(if it exists on the system).
 .It Ic log_options Xo
-.Pq "string, default no logging options"
+(string, default no logging options)
 .Xc
 Same as the
 .Fl x
@@ -437,7 +437,7 @@ warnings
 warnings
 .El
 .It Ic nfs_retransmit_counter Xo
-.Pq "numeric, default=110"
+(numeric, default=110)
 .Xc
 Same as the
 .Ic counter
@@ -447,7 +447,7 @@ option to
 .Nm amd .
 Specifies the retransmit counter's value in tenths of seconds.
 .It Ic nfs_retry_interval Xo
-.Pq "numeric, default=8"
+(numeric, default=8)
 .Xc
 Same as the
 .Ic interval
@@ -457,7 +457,7 @@ option to
 .Nm amd .
 Specifies the interval in tenths of seconds, between NFS/RPC/UDP retries.
 .It Ic nis_domain Xo
-.Pq "string, default to local NIS domain name"
+(string, default to local NIS domain name)
 .Xc
 Same as the
 .Fl y
@@ -471,7 +471,7 @@ maps.  The default is the system domain name.  This option is ignored if
 .Tn NIS
 support is not available.
 .It Ic normalize_hostnames Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 Same as the
 .Fl n
@@ -486,7 +486,7 @@ to translate aliases into
 .Qq official
 names.
 .It Ic os Xo
-.Pq "string, default to compiled in value"
+(string, default to compiled in value)
 .Xc
 Same as the
 .Fl O
@@ -500,7 +500,7 @@ you can override it to
 .Dq sos5 ,
 and use older maps which were written with the latter in mind.
 .It Ic osver Xo
-.Pq "string, default to compiled in value"
+(string, default to compiled in value)
 .Xc
 Same as the
 .Fl o
@@ -514,7 +514,7 @@ you can override it to
 .Dq 5.5.1 ,
 and use older maps that were written with the latter in mind.
 .It Ic pid_file Xo
-.Pq "string, default=/dev/stdout"
+(string, default=/dev/stdout)
 .Xc
 Specify a file to store the process ID of the running daemon into.  If not
 specified,
@@ -529,7 +529,7 @@ This file is used only if the
 .Ar print_pid
 option is on.
 .It Ic plock Xo
-.Pq "boolean, default=yes"
+(boolean, default=yes)
 .Xc
 Same as the
 .Fl S
@@ -553,9 +553,9 @@ process as needed.  This improves
 performance, at the cost of reserving the memory used by the
 .Nm amd
 process
-.Pq making it unavailable for other processes .
+(making it unavailable for other processes).
 .It Ic portmap_program Xo
-.Pq "numeric, default=300019"
+(numeric, default=300019)
 .Xc
 Specify an alternate Port-mapper RPC program number, other than the official
 number.  This is useful when running multiple
@@ -579,7 +579,7 @@ can fully control any number of
 .Nm amd
 processes running on the same host.
 .It Ic print_pid Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 Same as the
 .Fl p
@@ -590,7 +590,7 @@ If
 .Nm amd
 will print its process ID upon starting.
 .It Ic print_version Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 Same as the
 .Fl v
@@ -604,7 +604,7 @@ continues to run.  If
 will print its version information string, which includes some configuration
 and compilation values.
 .It Ic restart_mounts Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 Same as the
 .Fl r
@@ -618,7 +618,7 @@ mounted.  Whenever one of these would have been auto-mounted,
 .Nm amd
 inherits it.
 .It Ic selectors_on_default Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 If
 .Dq yes ,
@@ -638,12 +638,12 @@ follows:
     wire!=slip-net;opts:=intr,rsize=8192,wsize=8192
 .Ed
 .It Ic show_statfs_entries Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 If
 .Dq yes ,
 then all maps which are browsable will also show the number of entries
-.Pq keys
+(keys)
 they have when
 .Qq df
 runs.
@@ -651,7 +651,7 @@ runs.
 .Xr statfs 2
 system call.)
 .It Ic unmount_on_exit Xo
-.Pq "boolean, default=no"
+(boolean, default=no)
 .Xc
 If
 .Dq yes ,
@@ -660,7 +660,7 @@ then
 will attempt to unmount all file systems which it knows about.  Normally
 .Nm amd
 leaves all 
-.Pq esp.\&
+(esp.\&)
 .Tn NFS
 mounted filesystems intact.  Note that
 .Nm amd
@@ -673,11 +673,11 @@ flag are used.
 .Ss "Parameters applicable to regular map sections"
 .Bl -tag -width 4n
 .It Ic map_name Xo
-.Pq "string, must be specified"
+(string, must be specified)
 .Xc
 Name of the map where the keys are located.
 .It Ic tag Xo
-.Pq "string, default no tag"
+(string, default no tag)
 .Xc
 Each map entry in the configuration file can be tagged.  If no tag is
 specified, that map section will always be processed by
diff --git a/games/morse/morse.6 b/games/morse/morse.6
index e5f4ebf..1e3b68b 100644
--- a/games/morse/morse.6
+++ b/games/morse/morse.6
@@ -74,7 +74,7 @@ Similar to
 .Fl p ,
 but use the RTS line of
 .Ar device
-.Pq which must by a tty device
+(which must by a tty device)
 in order to emit the morse code.
 .It Fl e
 echo each character before it is sent, used together with either
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index ffee4d9..93be989 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -174,7 +174,7 @@ the library search path.
 .It Fl M
 Produce output about the mapping of segments of the input files and the
 values assigned to
-.Pq global
+(global)
 symbols in the output file.
 .It Fl N
 Produce a
@@ -227,7 +227,7 @@ to be marked as undefined. Useful to force loading of an archive member
 in the absence of any other references to that member.
 .It Fl V Ar version
 Put the given version number into the output shared library
-.Pq if one is created .
+(if one is created).
 Useful to make shared libraries compatible with other operating
 systems. E.g., SunOS 4.x libraries use version number 3. Defaults to 8.
 .It Fl X
diff --git a/gnu/usr.bin/ld/ld.1aout b/gnu/usr.bin/ld/ld.1aout
index 186a75b..3f71455 100644
--- a/gnu/usr.bin/ld/ld.1aout
+++ b/gnu/usr.bin/ld/ld.1aout
@@ -174,7 +174,7 @@ the library search path.
 .It Fl M
 Produce output about the mapping of segments of the input files and the
 values assigned to
-.Pq global
+(global)
 symbols in the output file.
 .It Fl N
 Produce a
@@ -226,7 +226,7 @@ to be marked as undefined. Useful to force loading of an archive member
 in the absence of any other references to that member.
 .It Fl V Ar version
 Put the given version number into the output shared library
-.Pq if one is created .
+(if one is created).
 Useful to make shared libraries compatible with other operating
 systems. E.g., SunOS 4.x libraries use version number 3. Defaults to 8.
 .It Fl X
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 19615ba..75c2f29 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -49,7 +49,8 @@ database.
 can read gzip'ed manpages.
 .Ar Directory
 names a directory containing manpage subdirectories
-.Pq named Pa man.+ .
+(named
+.Pa man.+ ) .
 Colons are treated as spaces, hence
 .Ic makewhatis $MANPATH
 or
@@ -66,7 +67,8 @@ does not check if old entries are valid.
 Print options and exit.
 .It Fl i , Fl indent Ar column
 Justify description strings to
-.Ar column Pq default 24 .
+.Ar column
+(default 24).
 .It Fl L , Fl locale
 Sense locale environment variables for possible localized man subdirectories
 and process this entries only.
@@ -82,7 +84,7 @@ instead of
 .Pa dirname/whatis Ns .
 .It Fl v , Fl verbose
 Issue more warnings
-.Pq to stderr .
+(to stderr).
 For every parsed man page write a single char:
 .Ql .\&
 for an uncompressed page,
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index e8bdefd..aa804db 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -170,12 +170,10 @@ Mainly useful for debugging when the log file is viewed continuously with
 .It Dv PKT_ALIAS_DENY_INCOMING
 If this mode bit is set, all incoming packets associated with new TCP
 connections or new UDP transactions will be marked for being ignored
-.Po
-.Fn PacketAliasIn
+.Fn ( PacketAliasIn
 returns
 .Dv PKT_ALIAS_IGNORED
-code
-.Pc
+code)
 by the calling program.
 Response packets to connections or transactions initiated from the packet
 aliasing host or local network will be unaffected.
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 5aa6b07..062f60d 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -544,7 +544,7 @@ The fifth and sixth level names are as follows:
 .El
 .It Li PF_INET
 Get or set various global information about the IPv4
-.Pq Internet Protocol version 4 .
+(Internet Protocol version 4).
 The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
@@ -585,7 +585,7 @@ For variables net.inet.*.ipsec, please refer to
 .El
 .It Li PF_INET6
 Get or set various global information about the IPv6
-.Pq Internet Protocol version 6 .
+(Internet Protocol version 6).
 The third level name is the protocol.
 The fourth level name is the variable name.
 .Pp
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index 1293e02..570a88d 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -66,9 +66,7 @@ Upon successful completion,
 .Fn time
 returns the value of time.
 Otherwise a value of
-.Po
-.Po Fa time_t Pc \-1
-.Pc
+.Pq Po Vt time_t Pc \-1
 is returned and the global variable
 .Va errno
 is set to indicate the error.
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index 52ee84e..e909dce 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -77,7 +77,8 @@ Multibyte characters are used for input and output
 and code each basic element as a sequence of C
 .Va char Ns s .
 Individual basic elements may map into one or more
-.Pq up to Dv MB_CHAR_MAX
+(up to
+.Dv MB_CHAR_MAX )
 bytes in a multibyte character.
 .Pp
 The current locale
@@ -128,10 +129,10 @@ categories.
 .Pp
 For convenience in processing,
 the wide character with value 0
-.Pq the null wide character
+(the null wide character)
 is recognized as the wide character string terminator,
 and the character with value 0
-.Pq the null byte
+(the null byte)
 is recognized as the multibyte character string terminator.
 Null bytes are not permitted within multibyte characters.
 .Pp
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index b9f6fa9..4003a83 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -105,13 +105,16 @@ addresses in the specified family:
 .Bl -tag -width AF_INETxxxx -compact
 .It Dv AF_INET
 .Li struct in_addr
-.Pq in Aq Pa netinet/in.h
+(in
+.Aq Pa netinet/in.h )
 .It Dv AF_LINK
 .Li struct sockaddr_dl
-.Pq in Aq Pa net/if_dl.h
+(in
+.Aq Pa net/if_dl.h )
 .\" .It Dv AF_INET6
 .\" .Li struct in6_addr
-.\" .Pq in Aq Pa netinet6/in6.h
+.\" (in
+.\" .Aq Pa netinet6/in6.h )
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 7dd98a1..cd73f28 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -107,9 +107,7 @@ A
 .Pf non Dv -NULL
 .Fa nodename
 string can be either a node name or a numeric host address string
-.Po
-i.e., a dotted-decimal IPv4 address or an IPv6 hex address
-.Pc .
+(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
 A
 .Pf non Dv -NULL
 .Fa servname
@@ -226,13 +224,13 @@ member of the
 structure, then the returned socket address structure will be ready for a
 call to
 .Fn connect
-.Pq for a connection-oriented protocol
+(for a connection-oriented protocol)
 or either
 .Fn connect ,
 .Fn sendto ,
 or
 .Fn sendmsg
-.Pq for a connectionless protocol .
+(for a connectionless protocol).
 In this case, if the
 .Fa nodename
 argument is a
@@ -379,10 +377,8 @@ and allows cut-and-paste input of scoped addresses.
 At the moment the code supports only link-local addresses in this format.
 The scope identifier is hardcoded to name of hardware interface associated
 with the link,
-.Po
-such as
-.Li ne0
-.Pc .
+(such as
+.Li ne0 ) .
 For example,
 .Dq Li fe80::1%ne0 ,
 which means
@@ -615,7 +611,7 @@ function is defined in
 .St -p1003.1g-2000 ,
 and documented in
 .Dq Basic Socket Interface Extensions for IPv6
-.Pq RFC2553 .
+(RFC2553).
 .\"
 .Sh BUGS
 The current implementation is not thread-safe.
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index a83e397..b1da0bc 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -114,11 +114,13 @@ field references address family specific data.  For
 .Dv AF_LINK
 addresses it contains a pointer to the
 .Fa struct if_data
-.Pq as defined in include file Aq Pa net/if.h
+(as defined in include file
+.Aq Pa net/if.h )
 which contains various interface attributes and statistics.
 For all other address families, it contains a pointer to the
 .Fa struct ifa_data
-.Pq as defined in include file Aq Pa net/if.h
+(as defined in include file
+.Aq Pa net/if.h )
 which contains per-address interface statistics.
 .Pp
 The data returned by
diff --git a/lib/libc/net/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index b31fe33..f960957 100644
--- a/lib/libc/net/getipnodebyname.3
+++ b/lib/libc/net/getipnodebyname.3
@@ -75,12 +75,10 @@ and
 for specifying address family and operation mode.
 The additional arguments allow programmer to get address for a nodename,
 for specific address family
-.Po
-such as
+(such as
 .Dv AF_INET
 or
-.Dv AF_INET6
-.Pc .
+.Dv AF_INET6 ) .
 The functions also require an additional pointer argument,
 .Ar error_num
 to return the appropriate error code,
@@ -97,9 +95,7 @@ the
 .Ar name
 argument can be either a node name or a numeric address
 string
-.Po
-i.e., a dotted-decimal IPv4 address or an IPv6 hex address
-.Pc .
+(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
 The
 .Ar af
 argument specifies the address family, either
@@ -112,7 +108,7 @@ argument specifies the types of addresses that are searched for,
 and the types of addresses that are returned.
 We note that a special flags value of
 .Dv AI_DEFAULT
-.Pq defined below
+(defined below)
 should handle most applications.
 That is, porting simple applications to use IPv6 replaces the call
 .Bd -literal -offset
@@ -192,10 +188,8 @@ That is, if no
 records are found then a query is made for
 .Li A
 records and any found are returned as IPv4-mapped IPv6 addresses
-.Po
-.Li h_length
-will be 16
-.Pc .
+.Li ( h_length
+will be 16).
 The
 .Dv AI_V4MAPPED
 flag is ignored unless
@@ -284,9 +278,7 @@ We noted that the
 function must allow the
 .Ar name
 argument to be either a node name or a literal address string
-.Po
-i.e., a dotted-decimal IPv4 address or an IPv6 hex address
-.Pc .
+(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
 This saves applications from having to call
 .Xr inet_pton 3
 to handle literal address strings.
@@ -329,15 +321,11 @@ is a copy of the
 argument,
 .Li h_length
 is either 4
-.Po
-for
-.Dv AF_INET
-.Pc
+(for
+.Dv AF_INET )
 or 16
-.Po
-for
-.Dv AF_INET6
-.Pc ,
+(for
+.Dv AF_INET6 ) ,
 .Li h_addr_list[0]
 is a pointer to the 4-byte or 16-byte binary address,
 and
@@ -453,7 +441,7 @@ and
 .Fn getipnodebyaddr
 are documented in
 .Dq Basic Socket Interface Extensions for IPv6
-.Pq RFC2553 .
+(RFC2553).
 .\"
 .Sh BUGS
 .Fn getipnodebyname
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 6b4f02d..8dc026c 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -122,9 +122,7 @@ The first value is actually defined as the constant
 in recent versions of BIND's
 .Aq Pa arpa/nameser.h
 header
-.Po
-older versions of BIND define this constant to be 256
-.Pc
+(older versions of BIND define this constant to be 256)
 and the second is a guess based on the services listed in the current
 Assigned Numbers RFC.
 .Pp
@@ -143,12 +141,10 @@ bit
 .Dv NI_NUMERICHOST
 is set, or if the host's name cannot be located in the DNS,
 the numeric form of the host's address is returned instead of its name
-.Po
-e.g., by calling
+(e.g., by calling
 .Fn inet_ntop
 instead of
-.Fn getnodebyaddr
-.Pc .
+.Fn getnodebyaddr ) .
 If the
 .Fa flag
 bit
@@ -158,7 +154,7 @@ is set, an error is returned if the host's name cannot be located in the DNS.
 If the flag bit
 .Dv NI_NUMERICSERV
 is set, the numeric form of the service address is returned
-.Pq e.g., its port number
+(e.g., its port number)
 instead of its name.
 The two
 .Dv NI_NUMERICxxx
@@ -302,7 +298,7 @@ function is defined in
 .St -p1003.1g-2000 ,
 and documented in
 .Dq Basic Socket Interface Extensions for IPv6
-.Pq RFC2553 .
+(RFC2553).
 .\"
 .Sh BUGS
 The current implementation is not thread-safe.
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index adf82cb..29ae464 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -139,4 +139,4 @@ R. Gilligan, S.  Thomson, J. Bound, and W. Stevens,
 The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
 .Sh STANDARDS
 These functions are defined in ``Basic Socket Interface Extensions for IPv6''
-.Pq RFC2533 .
+(RFC2533).
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index c2338fc..726a41c 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -102,7 +102,7 @@ is the number of options to be stored in the object.
 This is of little consequence, since it is assumed that most
 Hop-by-Hop option headers and Destination option headers carry only
 one option
-.Pq appendix B of [RFC-2460] .
+(appendix B of [RFC-2460]).
 .\"
 .Ss inet6_option_init
 .Fn inet6_option_init
@@ -171,7 +171,7 @@ field is immediately followed by the 8-bit option data length field,
 which is then followed immediately by the option data.
 The caller
 initializes these three fields
-.Pq the type-length-value, or TLV
+(the type-length-value, or TLV)
 before calling this function.
 .Pp
 The option type must have a value from
@@ -439,7 +439,7 @@ The implementation first appeared in KAME advanced networking kit.
 The functions
 are documented in
 .Dq Advanced Sockets API for IPv6
-.Pq RFC2292 .
+(RFC2292).
 .\"
 .Sh BUGS
 The text was shamelessly copied from RFC2292.
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 2c3fd9c..d09bba6 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -106,7 +106,7 @@ header of the specified
 .Fa type
 containing the specified number of
 .Fa segments
-.Pq addresses .
+(addresses).
 For an IPv6 Type 0 Routing header, the number
 of segments must be between 1 and 23, inclusive.  The return value
 includes the size of the cmsghdr structure that precedes the Routing
@@ -218,14 +218,14 @@ and writes a new Routing
 header that sends datagrams along the reverse of that route.
 Both
 arguments are allowed to point to the same buffer
-.Pq that is, the reversal can occur in place .
+(that is, the reversal can occur in place).
 .Pp
 The return value of the function is 0 on success, or -1 upon an
 error.
 .\"
 .Ss inet6_rthdr_segments
 This function returns the number of segments
-.Pq addresses
+(addresses)
 contained in
 the Routing header described by
 .Fa cmsg .
@@ -314,7 +314,7 @@ The implementation first appeared in KAME advanced networking kit.
 The functions
 are documented in
 .Dq Advanced Sockets API for IPv6
-.Pq RFC2292 .
+(RFC2292).
 .\"
 .Sh BUGS
 The text was shamelessly copied from RFC2292.
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 9d91f20..fc9b1b3 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -533,12 +533,10 @@ The endpoint of one range cannot begin another.
 the limit on repetition counts in bounded repetitions, is 255.
 .Pp
 A repetition operator
-.Po
-.Ql ?\& ,
+.Ql ( ?\& ,
 .Ql *\& ,
 .Ql +\& ,
-or bounds
-.Pc
+or bounds)
 cannot follow another
 repetition operator.
 A repetition operator cannot begin an expression or subexpression
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index f3de89d..83483be 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -61,12 +61,10 @@ stream (in reverse order).
 A successful intervening call,
 using the same stream,
 to one of the file positioning functions
-.Po
-.Xr fseek 3 ,
+.Xr ( fseek 3 ,
 .Xr fsetpos 3 ,
 or
-.Xr rewind 3
-.Pc
+.Xr rewind 3 )
 will discard the pushed back characters.
 .Pp
 One character of push-back is guaranteed,
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index b69cbee..78ffd77 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -115,10 +115,10 @@ without
 .Fa %p
 will produce undefined results.
 Note that 12AM
-.Pq ante meridiem
+(ante meridiem)
 is taken as midnight
 and 12PM
-.Pq post meridiem
+(post meridiem)
 is taken as noon.
 .Pp
 The
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index f0b9654..23bacb0 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -87,9 +87,12 @@ this is a variant of
 If the user has super-user privileges,
 the signal is sent to all processes excluding
 system processes
-.Pq with Dv P_SYSTEM flag set ,
+(with
+.Dv P_SYSTEM
+flag set),
 process with ID 1
-.Pq usually Xr init 8 ,
+(usually
+.Xr init 8 ) ,
 and the process sending the signal.
 If the user is not the super user, the signal is sent to all processes
 with the same uid as the user excluding the process sending the signal.
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index a223b80..177d88b 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -23,10 +23,8 @@ process) to control another (the
 .Em traced
 process).  Most of the time, the traced process runs normally, but when
 it receives a signal
-.Po
-see
-.Xr sigaction 2
-.Pc ,
+(see
+.Xr sigaction 2 ) ,
 it stops.  The tracing process is expected to notice this via
 .Xr wait 2
 or the delivery of a
@@ -58,10 +56,8 @@ traced process stops, it cannot be made to continue except via
 When a process has used this request and calls
 .Xr execve 2
 or any of the routines built on it
-.Po
-such as
-.Xr execv 3
-.Pc ,
+(such as
+.Xr execv 3 ) ,
 it will stop before executing the first instruction of the new image.
 Also, any setuid or setgid bits on the executable being executed will
 be ignored.
@@ -136,9 +132,7 @@ The traced process continues execution.
 .Fa addr
 is an address specifying the place where execution is to be resumed (a
 new value for the program counter), or
-.Po
-.Vt caddr_t
-.Pc Ns 1
+.Po Vt caddr_t Pc Ns 1
 to indicate that execution is to pick up where it left off.
 .Fa data
 provides a signal number to be delivered to the traced process as it
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 6929ff1..9044679 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -186,7 +186,8 @@ doesn't necessarily block until the data has been transferred, it
 is possible to transfer an open file descriptor across an
 .Dv AF_UNIX
 domain socket
-.Pq see Xr recv 2 ,
+(see
+.Xr recv 2 ) ,
 then
 .Fn close
 it before it has actually been sent, the result being that the receiver
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 5ac7e34..5141c03 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -73,11 +73,9 @@ returns the address of an array in which the name has been stored.
 .Pp
 If the name associated with the effective UID of the current process
 could not be found, either a null pointer will be returned, or
-.Po
-if
+(if
 .Fa s
-is non-NULL
-.Pc
+is non-NULL)
 the buffer
 .Fa s
 will be filled with a null string.
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 5034163..8108026 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -207,9 +207,7 @@ The colon between
 and the command,
 .Ar command ,
 will be replaced with a NUL
-.Po
-.Dq \e0
-.Pc .
+.Pq Dq \e0 .
 .It Fn el_set
 Set
 .Nm
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 2d8c3e4..816ccf3 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -156,10 +156,8 @@ can contain control characters of the form
 .Sm off
 .Sq No ^ Ar character
 .Sm on
-.Po
-e.g.
-.Sq ^A
-.Pc ,
+(e.g.
+.Sq ^A ) ,
 and the following backslashed escape sequences:
 .Pp
 .Bl -tag -compact -offset indent -width 4n
@@ -261,13 +259,9 @@ set of tty modes respectively; defaulting to
 Without other arguments,
 .Ic setty
 lists the modes in the chosen set which are fixed on
-.Po
-.Sq +mode
-.Pc
+.Pq Sq +mode
 or off
-.Po
-.Sq -mode
-.Pc .
+.Pq Sq -mode .
 .Fl a
 lists all tty modes in the chosen set regardless of the setting.
 With
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index f841df2..0b293ff 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -110,7 +110,7 @@ means to consult to SPD defined by
 .It Ar direction Li bypass
 .Li bypass
 means to be bypassed the IPsec processing.
-.Pq packet will be transmitted in clear .
+(packet will be transmitted in clear).
 This is for privileged socket.
 .It Xo
 .Ar direction
@@ -167,7 +167,7 @@ is this node
 and
 .Ar src
 is the other node
-.Pq peer .
+(peer).
 If
 .Ar mode
 is
@@ -196,9 +196,9 @@ regarding the system default.
 means that a relevant SA can be used when available,
 since the kernel may perform IPsec operation against packets when possible.
 In this case, packets can be transmitted in clear
-.Pq when SA is not available ,
+(when SA is not available),
 or encrypted
-.Pq when SA is available .
+(when SA is available).
 .Li require
 means that a relevant SA is required,
 since the kernel must perform IPsec operation against packets.
@@ -241,7 +241,7 @@ Refer to
 for detail.
 .Pp
 Here are several examples
-.Pq long lines are wrapped for readability :
+(long lines are wrapped for readability):
 .Bd -literal -offset indent
 in discard
 out ipsec esp/transport//require
@@ -255,7 +255,7 @@ in ipsec ipcomp/transport//use
 returns a pointer to the allocated buffer of policy specification if successful; otherwise a NULL pointer is returned.
 .Fn ipsec_get_policylen
 returns with positive value
-.Pq meaning the buffer size
+(meaning the buffer size)
 on success, and negative value on errors.
 .Fn ipsec_dump_policy
 returns a pointer to dynamically allocated region on success,
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index 1f69450..9151857 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -74,7 +74,8 @@ a ``fingerprint'' of the input-data, which doesn't disclose the actual
 input.
 .Pp
 .Tn SHA
-.Pq \&or Tn SHA-0
+(or
+.Tn SHA-0 )
 is the original Secure Hash Algorithm specified in
 .Tn FIPS
 160.  It was quickly proven insecure, and has been superseded by
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 3f00428..fcb0921 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -133,7 +133,7 @@ will be split into words and executed using
 .Xr execve 2 .
 Words are separated by any combinations of tabs and spaces.
 Arguments containing whitespace should be enclosed in single quotes
-.Pq ' .
+.Pq Li ' .
 Note that no shell-style globbing or other variable substitution occurs.
 .Sh EXAMPLES
 .Bd -literal
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 6376cfc..9687a1c 100644
--- a/libexec/pppoed/pppoed.8
+++ b/libexec/pppoed/pppoed.8
@@ -36,7 +36,7 @@
 .Op Fl Fd\&
 .Op Fl P Ar pidfile
 .Op Fl a Ar name
-.Op Fl e Ar exec No \&| Fl l Ar label
+.Op Fl e Ar exec | Fl l Ar label
 .Op Fl n Ar ngdebug
 .Op Fl p Ar provider
 .Ar interface
@@ -76,7 +76,8 @@ After receiving a request (PADI) from the PPPoE netgraph node,
 .Xr fork 2 Ns No s
 a child process and returns to service further requests.
 The child process offers service
-.Pq using Ar name
+(using
+.Ar name )
 and waits for a
 .Dv SUCCESS
 indication from the PPPoE node.
@@ -103,7 +104,8 @@ The child process will have standard input and standard output
 attached to the same
 .Xr netgraph 4
 data socket
-.Pq see Xr ng_socket 4
+(see
+.Xr ng_socket 4 )
 when started.
 .Pp
 Upon invocation,
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index 78ed611..d3aaeea 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -113,10 +113,8 @@ The following conversions can be used:
 .Bl -tag -width "xxxx"
 .It \&%a
 The main program's name
-.Po
-also known as
-.Dq __progname
-.Pc .
+(also known as
+.Dq __progname ) .
 .It \&%A
 The value of the environment variable
 .Ev LD_TRACE_LOADED_OBJECTS_PROGNAME
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 4b537a3..691429c 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -738,7 +738,7 @@ call in
 .Nm
 bails out when it sees the second argument to
 .Fl c
-.Pq 0x00 ,
+(0x00),
 above.  Fixing this behavior would take some gross code, or changes to the
 .Xr getopt 3
 interface.  The best way to circumvent this problem is to always make sure
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index ce4e10a..63d4097 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -317,7 +317,7 @@ behavior, i.e. super-user can specify the desired
 on a command line, and
 .Nm
 will signal the original
-.Pq PID 1
+(PID 1)
 .Nm
 as follows:
 .Bl -column Run-level SIGTERM
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 29f61e4..16f2873 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -173,17 +173,13 @@ While
 or
 .Cm flush Ns ing ,
 be quiet about actions
-.Po
-implies
-.Fl f
-.Pc .
+(implies
+.Fl f ) .
 This is useful for adjusting rules by executing multiple
 .Nm
 commands in a script
-.Po
-e.g.,
-.Ql sh\ /etc/rc.firewall
-.Pc ,
+(e.g.,
+.Ql sh\ /etc/rc.firewall ) ,
 or by processing a file of many
 .Nm
 rules,
@@ -312,10 +308,8 @@ A match is only declared with the specified probability
 (floating point number between 0 and 1).
 This can be useful for a number of applications such as
 random packet drop or
-.Po
-in conjunction with
-.Xr dummynet 4
-.Pc
+(in conjunction with
+.Xr dummynet 4 )
 to simulate the effect of multiple paths leading to out-of-order
 packet delivery.
 .It Ar action :
@@ -335,7 +329,7 @@ The search terminates.
 is an alias for
 .Cm deny .
 .It Cm reject
-.Pq Deprecated .
+(Deprecated).
 Discard packets that match this rule, and try to send an ICMP
 host unreachable notice.
 The search terminates.
@@ -382,11 +376,9 @@ Send a copy of packets matching this rule to the
 socket bound to port
 .Ar port .
 The search terminates and the original packet is accepted
-.Po
-but see section
+(but see section
 .Sx BUGS
-below
-.Pc .
+below).
 .It Cm fwd Ar ipaddr Ns Xo
 .Op , Ns Ar port
 .Xc
@@ -1110,11 +1102,9 @@ The
 .Nm
 filter list may not be modified if the system security level
 is set to 3 or higher
-.Po
-see
+(see
 .Xr init 8
-for information on system security levels
-.Pc .
+for information on system security levels).
 .El
 .Sh PACKET DIVERSION
 A
@@ -1159,7 +1149,7 @@ resize it on the fly you will probably have to
 and reload the ruleset.
 .It Em net.inet.ip.fw.dyn_count : No 3
 Current number of dynamic rules
-.Pq read-only .
+(read-only).
 .It Em net.inet.ip.fw.dyn_max : No 1000
 Maximum number of dynamic rules.
 When you hit this limit, no more dynamic rules can be
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 50bd126..963571a 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -24,7 +24,7 @@ The MD5 algorithm is intended for digital signature applications, where a
 large file must be
 .Dq compressed
 in a secure manner before being encrypted with a private
-.Pq secret
+(secret)
 key under a public-key cryptosystem such as
 .Em RSA .
 .Pp
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 905dd43..4017e86 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -81,10 +81,8 @@ below, and the entry will be made in the internal translation table.
 .It Fl log_denied
 Log denied incoming packets via
 .Xr syslog 3
-.Po
-see also
-.Fl log_facility
-.Pc .
+(see also
+.Fl log_facility ) .
 .It Fl log_facility Ar facility_name
 Use specified log facility when logging information via
 .Xr syslog 3 .
@@ -177,8 +175,8 @@ The mapping is 1:1 meaning port 3300 maps to 2300, 3301 maps to 2301, etc.
 .Oc
 Redirect incoming IP packets of protocol
 .Ar proto
-.Po see Xr protocols 5
-.Pc
+(see
+.Xr protocols 5 )
 destined for
 .Ar publicIP
 address to a
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index c95f231..2d8110d 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -82,19 +82,21 @@ bytes used to fill out the packet.  The options are as follows:
 .It Fl A
 Audible.
 Include a bell
-.Pq ASCII 0x07
+.Tn ( ASCII
+0x07)
 character in the output when no packet is received before the next packet
 is transmitted.
 .It Fl a
 Audible.
 Include a bell
-.Pq ASCII 0x07
+.Tn ( ASCII
+0x07)
 character in the output when any packet is received.
 This option is ignored
 if other format options are present.
 .It Fl c Ar count
 Stop after sending
-.Pq and receiving
+(and receiving)
 .Ar count
 .Tn ECHO_RESPONSE
 packets.
@@ -214,10 +216,8 @@ network.
 If the host is not on a directly-attached network, an error is returned.
 This option can be used to ping a local host through an interface
 that has no route through it
-.Po
-e.g., after the interface was dropped by
-.Xr routed 8
-.Pc .
+(e.g., after the interface was dropped by
+.Xr routed 8 ) .
 .It Fl s Ar packetsize
 Specify the number of data bytes to be sent.
 The default is 56, which translates into 64
@@ -259,7 +259,7 @@ If duplicate packets are received, they are not included in the packet
 loss calculation, although the round trip time of these packets is used
 in calculating the round-trip time statistics.
 When the specified number of packets have been sent
-.Pq and received
+(and received)
 or if the program is terminated with a
 .Dv SIGINT ,
 a brief summary is displayed, showing the number of packets sent and
@@ -282,12 +282,14 @@ header followed by an arbitrary amount of data.
 When a
 .Ar packetsize
 is given, this indicated the size of this extra piece of data
-.Pq the default is 56 .
+(the default is 56).
 Thus the amount of data received inside of an IP packet of type
 .Tn ICMP
 .Tn ECHO_REPLY
 will always be 8 bytes more than the requested data space
-.Pq the Tn ICMP header .
+(the
+.Tn ICMP
+header).
 .Pp
 If the data space is at least eight bytes large,
 .Nm
@@ -302,7 +304,7 @@ Duplicate packets should never occur when pinging a unicast address,
 and seem to be caused by
 inappropriate link-level retransmissions.
 Duplicates may occur in many situations and are rarely
-.Pq if ever
+(if ever)
 a good sign, although the presence of low levels of duplicates may not
 always be cause for alarm.
 Duplicates are expected when pinging a broadcast or multicast address,
@@ -359,12 +361,10 @@ specification states that the
 field for
 .Tn TCP
 packets should be set to 60, but many systems use smaller values
-.Po
-.Bx 4.3
+.No ( Bx 4.3
 uses 30,
 .Bx 4.2
-used 15
-.Pc .
+used 15).
 .Pp
 The maximum possible value of this field is 255, and most
 .Ux
@@ -430,7 +430,8 @@ heard from the specified
 .Ar host ;
 a status of two if the transmission was successful but no responses
 were received; or another value
-.Pq from Aq Pa sysexits.h
+(from
+.Aq Pa sysexits.h )
 if an error occurred.
 .Sh SEE ALSO
 .Xr netstat 1 ,
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index ccd6b2b..9ae4c80 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -102,7 +102,7 @@ The options are as follows:
 .\" old ipsec
 .\" .It Fl A
 .\" Enables transport-mode IPsec authentication header
-.\" .Pq experimental .
+.\" (experimental).
 .It Fl a Ar addrtype
 Generate ICMPv6 Node Information Node Addresses query, rather than echo-request.
 .Ar addrtype
@@ -133,7 +133,7 @@ This is an experimental option.
 Set socket buffer size.
 .It Fl c Ar count
 Stop after sending
-.Pq and receiving
+(and receiving)
 .Ar count
 .Tn ECHO_RESPONSE
 packets.
@@ -143,7 +143,7 @@ Set the
 option on the socket being used.
 .\" .It Fl E
 .\" Enables transport-mode IPsec encapsulated security payload
-.\" .Pq experimental .
+.\" (experimental).
 .It Fl f
 Flood ping.
 Outputs packets as fast as they come back or one hundred times per second,
@@ -196,7 +196,7 @@ Probe node information multicast group
 .Pq Li ff02::2:xxxx:xxxx .
 .Ar host
 must be string hostname of the target
-.Pq must not be a numeric IPv6 address .
+(must not be a numeric IPv6 address).
 Node information multicast group will be computed based on given
 .Ar host ,
 and will be used as the final destination.
@@ -224,16 +224,14 @@ when finished.
 .It Fl R
 Make the kernel believe that the target
 .Ar host
-.Po
-or the first
+(or the first
 .Ar hop
 if you specify
-.Ar hops
-.Pc
+.Ar hops )
 is reachable, by injecting upper-layer reachability confirmation hint.
 The option is meaningful only if the target
 .Ar host
-.Pq or the first hop
+(or the first hop)
 is a neighbor.
 .It Fl S Ar sourceaddr
 Specifies the source address of request packets.
@@ -300,7 +298,7 @@ If duplicate packets are received, they are not included in the packet
 loss calculation, although the round trip time of these packets is used
 in calculating the round-trip time statistics.
 When the specified number of packets have been sent
-.Pq and received
+(and received)
 or if the program is terminated with a
 .Dv SIGINT ,
 a brief summary is displayed, showing the number of packets sent and
@@ -323,12 +321,14 @@ during normal operations or from automated scripts.
 .\" When a
 .\" .Ar packetsize
 .\" is given, this indicated the size of this extra piece of data
-.\" .Pq the default is 56 .
+.\" (the default is 56).
 .\" Thus the amount of data received inside of an IP packet of type
 .\" .Tn ICMP
 .\" .Tn ECHO_REPLY
 .\" will always be 8 bytes more than the requested data space
-.\" .Pq the Tn ICMP header .
+.\" (the
+.\" .Tn ICMP
+.\" header).
 .\" .Pp
 .\" If the data space is at least eight bytes large,
 .\" .Nm
@@ -343,7 +343,7 @@ Duplicate packets should never occur when pinging a unicast address,
 and seem to be caused by
 inappropriate link-level retransmissions.
 Duplicates may occur in many situations and are rarely
-.Pq if ever
+(if ever)
 a good sign, although the presence of low levels of duplicates may not
 always be cause for alarm.
 Duplicates are expected when pinging a broadcast or multicast address,
@@ -354,7 +354,7 @@ Damaged packets are obviously serious cause for alarm and often
 indicate broken hardware somewhere in the
 .Nm
 packet's path
-.Pq in the network or in the hosts .
+(in the network or in the hosts).
 .Sh TRYING DIFFERENT DATA PATTERNS
 The
 (inter)network
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index c9cd26b..2fb68aa 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -192,7 +192,8 @@ by the
 option becomes the only console.
 .It Fl d
 enter the DDB kernel debugger
-.Pq see Xr ddb 4
+(see
+.Xr ddb 4 )
 as early as possible in kernel initialization.
 .It Fl g
 use the GDB remote debugging protocol.
@@ -223,13 +224,15 @@ options are automatically set.
 .It Fl r
 use the statically configured default for the device containing the
 root file system
-.Pq see Xr config 8 .
+(see
+.Xr config 8 ) .
 Normally, the root file system is on the device
 that the kernel was loaded from.
 .It Fl s
 boot into single-user mode; if the console is marked as
 .Dq insecure
-.Pq see Xr ttys 5 ,
+(see
+.Xr ttys 5 ) ,
 the root password must be entered.
 .It Fl v
 be verbose during device probing (and later).
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index b5332e7..5a56e00 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -318,7 +318,7 @@ The optional
 modifier specifies that the
 .Dv RTF_LLINFO
 routing table entry is the
-.Dq published Pq proxy-only
+.Dq published (proxy-only)
 .Tn ARP
 entry, as reported by
 .Xr arp 8 .
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 0fedfe7..b7d6c07 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -61,16 +61,12 @@ as well as Security Policy Database (SPD) entries in the kernel.
 .Pp
 .Nm
 takes a series of operations from the standard input
-.Po
-if invoked with
-.Fl c
-.Pc
+(if invoked with
+.Fl c )
 or the file named
 .Ar filename
-.Po
-if invoked with
-.Fl f Ar filename
-.Pc .
+(if invoked with
+.Fl f Ar filename ) .
 .Bl -tag -width Ds
 .It Fl D
 Dump the SAD entries.
@@ -228,11 +224,9 @@ IPCOMP
 Security Parameter Index (SPI) for the SAD and the SPD.
 It must be decimal number or hexadecimal number
 You can not use the set of SPI values in the range 0 through 255.
-.Po
-with
+(with
 .Li 0x
-attached
-.Pc .
+attached).
 .\"
 .Pp
 .It Ar extensions
@@ -302,7 +296,7 @@ If
 is not specified with
 .Li ipcomp
 line, the kernel will use well-known IPComp CPI
-.Pq compression parameter index
+(compression parameter index)
 on IPComp CPI field on packets, and
 .Ar spi
 field will be ignored.
@@ -403,7 +397,7 @@ NOTE:
 .Ar upperspec
 does not work against forwarding case at this moment,
 as it requires extra reassembly at forwarding node
-.Pq not implemented at this moment .
+(not implemented at this moment).
 We have many protocols in
 .Pa /etc/protocols ,
 but protocols except of TCP, UDP and ICMP may not be suitable to use with IPSec.
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 4838c6d..3bd59c7 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -65,7 +65,7 @@ The system is halted at the specified
 .Ar time .
 .It Fl p
 The system is halted and the power is turned off
-.Pq hardware support required
+(hardware support required)
 at the specified
 .Ar time .
 .It Fl r
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index a58b093..b7c5bff 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -81,10 +81,7 @@ string operators,
 character tests and character operators,
 des encryption routines,
 storage allocation, time functions, signal handling and more.
-.It Xr libcurses Po
-.Fl l Ns Ar curses
-.Fl l Ns Ar termcap
-.Pc
+.It Xr libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.
 (See
@@ -102,7 +99,8 @@ indicates the proper interface to use.
 .It Xr libkvm Pq Fl l Ns Ar kvm
 Functions used to access kernel memory are in this library.  They can be used
 against both a running system and a crash dump.
-.Pq See Xr kvm 3 . )
+(See
+.Xr kvm 3 . )
 .It Xr libl Pq Fl l Ns Ar l
 The library for
 .Xr lex 1 .
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index 16da918..d95e39b 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -51,7 +51,7 @@ AdvanSys products incorporating these chips include the
 and
 .Tn ABP3950U2W .
 Both chips support, synchronous transfers
-.Pq 20MHz and 40MHz max respectively ,
+(20MHz and 40MHz max respectively),
 16bit transfers, tagged queueing,
 and up to 253 concurrent SCSI transactions.
 .Pp
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index e9f971f..adce166 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -140,9 +140,11 @@ The
 .Nm
 driver accepts the following driver flags.  They can be set either in the
 kernel configuration file
-.Pq see Xr config 8 ,
+(see
+.Xr config 8 ) ,
 or else in the User Configuration Menu at boot time
-.Pq see Xr boot 8 .
+(see
+.Xr boot 8 ) .
 .Bl -tag -width FAIL
 .It bit 0 (FAIL_IF_NO_KBD)
 By default the
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 1aba04d..3211496 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -56,7 +56,8 @@ The following kernel configuration options can be used to control the
 .Nm
 driver.
 They may be set in the kernel configuration file
-.Pq see Xr config 8 .
+(see
+.Xr config 8 ) .
 .Bl -tag -width MOUSE
 .It Em KBD_RESETDELAY=X , KBD_MAXWAIT=Y
 The keyboard driver
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 21d4f9c..376254b 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -522,11 +522,9 @@ M[k] <- X
 The alu instructions perform operations between the accumulator and
 index register or constant, and store the result back in the accumulator.
 For binary operations, a source mode is required
-.Po
-.Dv BPF_K
+.Dv ( BPF_K
 or
-.Dv BPF_X
-.Pc .
+.Dv BPF_X ) .
 .Pp
 .Bl -tag -width "BPF_ALU+BPF_MUL+BPF_K" -compact
 .It Li BPF_ALU+BPF_ADD+BPF_K
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index 5941318..48101bc 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -100,10 +100,8 @@ the tag is interpreted as the rule number
 rule processing should restart.
 .Sh LOOP AVOIDANCE
 Packets written into a divert socket
-.Po
-using
-.Xr sendto 2
-.Pc
+(using
+.Xr sendto 2 )
 re-enter the packet filter at the rule number
 following the tag given in the port part of the socket address, which
 is usually already set at the rule number that caused the diversion
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 2d25c69..64a3c5a 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -63,12 +63,13 @@ Also, administrator needs to configure protocol and addresses used for the
 inner header, by using
 .Xr ifconfig 8 .
 Note that IPv6 link-local address
-.Pq those start with Li fe80::
+(those start with
+.Li fe80:: )
 will be automatically configured whenever possible.
 You may need to remove IPv6 link-local address manually using
 .Xr ifconfig 8 ,
 when you would like to disable the use of IPv6 as inner header
-.Pq like when you need pure IPv4-over-IPv6 tunnel .
+(like when you need pure IPv4-over-IPv6 tunnel).
 Finally, use routing table to route the packets toward
 .Nm
 interface.
@@ -103,20 +104,16 @@ With
 .Dv IFF_LINK1 ,
 .Nm
 will copy ECN bits
-.Po
-.Dv 0x02
+.Dv ( 0x02
 and
 .Dv 0x01
-on IPv4 TOS byte or IPv6 traffic class byte
-.Pc
+on IPv4 TOS byte or IPv6 traffic class byte)
 on egress and ingress, as follows:
 .Bl -tag -width "Ingress" -offset indent
 .It Ingress
 Copy TOS bits except for ECN CE
-.Po
-masked with
-.Dv 0xfe
-.Pc
+(masked with
+.Dv 0xfe )
 from
 inner to outer.
 set ECN CE bit to
@@ -181,7 +178,7 @@ For example, you cannot usually use
 to talk with IPsec devices that use IPsec tunnel mode.
 .Pp
 The current code does not check if the ingress address
-.Pq outer source address
+(outer source address)
 configured to
 .Nm
 makes sense.
@@ -192,7 +189,7 @@ and your node will generate packets with a spoofed source address.
 If the outer protocol is IPv4,
 .Nm
 does not try to perform path MTU discovery for the encapsulated packet
-.Pq DF bit is set to 0 .
+(DF bit is set to 0).
 .Pp
 If the outer protocol is IPv6, path MTU discovery for encapsulated packet
 may affect communication over the interface.
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 3aeb1c3..c30fbbf 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -113,7 +113,7 @@ system calls may be used).
 Outgoing packets automatically have an
 .Tn IPv6
 header prepended to them
-.Pq based on the destination address .
+(based on the destination address).
 .Tn ICMPv6
 pseudo header checksum field
 .Pq Li icmp6_cksum
@@ -171,7 +171,7 @@ Six macros operate on an icmp6_filter structure:
 .El
 .Pp
 The first argument to the last four macros
-.Pq an integer
+(an integer)
 is an
 .Tn ICMPv6
 message type, between 0 and 255.
@@ -199,7 +199,7 @@ messages of a given
 .Tn ICMPv6
 type should be passed to the application
 or not passed to the application
-.Pq blocked .
+(blocked).
 .Pp
 The final two macros,
 .Dv WILLPASS
@@ -262,8 +262,6 @@ socket with a network address for which no network interface exists.
 .\"
 .Sh HISTORY
 The implementation is based on KAME stack
-.Po
-which is descendant of WIDE hydrangea IPv6 stack kit
-.Pc .
+(which is descendant of WIDE hydrangea IPv6 stack kit).
 .Pp
 Part of the document was shamelessly copied from RFC2292.
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index 5288a76..405f69b 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -132,7 +132,8 @@ was full
 .Pq Li struct if_data
 more information from a structure defined in
 .Aq Pa net/if.h
-.Pq see Xr if_data 9
+(see
+.Xr if_data 9 )
 .El
 .Pp
 Class-specific information can be retrieved by examining the
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index c87818f..22a1062 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -88,10 +88,8 @@ struct sockaddr_in6 {
 .Pp
 Sockets may be created with the local address
 .Dq Dv ::
-.Po
-which is equal to IPv6 address
-.Dv 0:0:0:0:0:0:0:0
-.Pc
+(which is equal to IPv6 address
+.Dv 0:0:0:0:0:0:0:0 )
 to affect
 .Dq wildcard
 matching on incoming messages.
@@ -313,7 +311,7 @@ Boolean: enable/disable receiving of
 router advertisement packets,
 and autoconfiguration of address prefixes and default routers.
 The node must be a host
-.Pq not a router
+(not a router)
 for the option to be meaningful.
 Defaults to off.
 .It Dv IPV6CTL_KEEPFAITH
@@ -332,7 +330,7 @@ Defaults to off.
 Integer: default interval between
 .Tn IPv6
 packet forwarding engine log output
-.Pq in seconds .
+(in seconds).
 .It Dv IPV6CTL_HDRNESTLIMIT
 .Pq ip6.hdrnestlimit
 Integer: default number of the maximum
@@ -424,21 +422,17 @@ Basically, it says this:
 A specific bind on an
 .Dv AF_INET6
 socket
-.Po
-.Xr bind 2
-with an address specified
-.Pc
+.Xr ( bind 2
+with an address specified)
 should accept IPv6 traffic to that address only.
 .It
 If you perform a wildcard bind
 on an
 .Dv AF_INET6
 socket
-.Po
-.Xr bind 2
+.Xr ( bind 2
 to IPv6 address
-.Li ::
-.Pc ,
+.Li :: ) ,
 and there is no wildcard bind
 .Dv AF_INET
 socket on that TCP/UDP port, IPv6 traffic as well as IPv4 traffic
@@ -465,9 +459,7 @@ However, RFC2553 does not define the ordering constraint between calls to
 .Xr bind 2 ,
 nor how IPv4 TCP/UDP port numbers and IPv6 TCP/UDP port numbers
 relate to each other
-.Po
-should they be integrated or separated
-.Pc .
+(should they be integrated or separated).
 Implemented behavior is very different from kernel to kernel.
 Therefore, it is unwise to rely too much upon the behavior of
 .Dv AF_INET6
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index bdf2a23..d4037ec 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -70,7 +70,8 @@ sometimes also called
 They are usually located under the directory
 .Pa /dev
 in the file system hierarchy
-.Pq see also Xr hier 7 .
+(see also
+.Xr hier 7 ) .
 .Pp
 Until
 .Xr devfs 5
@@ -95,7 +96,7 @@ Some devices come in two flavors:
 and
 .Em character
 devices, or by a better name, buffered and unbuffered
-.Pq raw
+(raw)
 devices.  The traditional names are reflected by the letters
 .Ql b
 and
@@ -123,7 +124,7 @@ device.  This includes making backups of entire disk partitions, or
 to
 .Em raw
 floppy disks
-.Pq i.e. those used like tapes .
+(i.e. those used like tapes).
 .Pp
 Access restrictions to device nodes are usually subject of the regular
 file permissions of the device node entry, instead of being implied
@@ -146,11 +147,9 @@ manual pages in this section provide a sample line for the
 configuration file in their synopsis portion.  See also the sample
 config file
 .Pa /sys/i386/conf/LINT
-.Po
-for the
+(for the
 .Em i386
-architecture
-.Pc .
+architecture).
 .Sh SEE ALSO
 .Xr close 2 ,
 .Xr ioctl 2 ,
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 3faf320..e5f8e0a 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -96,9 +96,9 @@ There are several
 .Xr setsockopt 2 Ns / Ns Xr getsockopt 2
 options.
 They are separated into the basic IPv6 sockets API
-.Pq defined in RFC2553 ,
+(defined in RFC2553),
 and the advanced API
-.Pq defined in RFC2292 .
+(defined in RFC2292).
 The basic API looks very similar to the API presented in
 .Xr ip 4 .
 Advanced API uses ancillary data and can handle more complex cases.
@@ -697,9 +697,7 @@ are not defined in the RFCs and should be considered implementation dependent.
 .\"
 .Sh HISTORY
 The implementation is based on KAME stack
-.Po
-which is descendant of WIDE hydrangea IPv6 stack kit
-.Pc .
+(which is descendant of WIDE hydrangea IPv6 stack kit).
 .Pp
 Part of the document was shamelessly copied from RFC2553 and RFC2292.
 .\"
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 29c097c..93bde4e 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -43,17 +43,15 @@
 is a security protocol in Internet Protocol layer.
 .Nm
 is defined for both IPv4 and IPv6
-.Po
-.Xr inet 4
+.Xr ( inet 4
 and
-.Xr inet6 4
-.Pc .
+.Xr inet6 4 ) .
 .Nm
 consists of two sub-protocols, namely
 ESP
-.Pq encapsulated security payload
+(encapsulated security payload)
 and AH
-.Pq authentication header .
+(authentication header).
 ESP protects IP payload from wire-tapping by encrypting it by
 secret key cryptography algorithms.
 AH guarantees integrity of IP packet
@@ -95,9 +93,9 @@ interface is used to define host-wide default behavior.
 .Pp
 The kernel code does not implement dynamic encryption key exchange protocol
 like IKE
-.Pq Internet Key Exchange .
+(Internet Key Exchange).
 That should be implemented as userland programs
-.Pq usually as daemons ,
+(usually as daemons),
 by using the above described APIs.
 .\"
 .Ss Policy management
@@ -196,17 +194,17 @@ during AH authentication data computation.
 The variable is for tweaking AH behavior to interoperate with devices that
 implement RFC1826 AH.
 It should be set to non-zero
-.Pq clear the type-of-service field
+(clear the type-of-service field)
 for RFC2402 conformance.
 .It Li ipsec.ah_offsetmask
 During AH authentication data computation, the kernel will include
 16bit fragment offset field
-.Pq including flag bits
+(including flag bits)
 in IPv4 header, after computing logical AND with the variable.
 The variable is for tweaking AH behavior to interoperate with devices that
 implement RFC1826 AH.
 It should be set to zero
-.Pq clear the fragment offset field during computation
+(clear the fragment offset field during computation)
 for RFC2402 conformance.
 .It Li ipsec.dfbit
 The variable configures the kernel behavior on IPv4 IPsec tunnel encapsulation.
@@ -217,7 +215,7 @@ The variable is supplied to conform to RFC2401 chapter 6.1.
 .It Li ipsec.ecn
 If set to non-zero, IPv4 IPsec tunnel encapsulation/decapsulation behavior will
 be friendly to ECN
-.Pq explicit congestion notification ,
+(explicit congestion notification),
 as documented in
 .Li draft-ietf-ipsec-ecn-02.txt .
 .Xr gif 4
@@ -297,20 +295,16 @@ AH and tunnel mode encapsulation may not work as you might expect.
 If you configure inbound
 .Dq require
 policy against AH tunnel or any IPsec encapsulating policy with AH
-.Po
-like
-.Dq Li esp/tunnel/A-B/use ah/transport/A-B/require
-.Pc ,
+(like
+.Dq Li esp/tunnel/A-B/use ah/transport/A-B/require ) ,
 tunnelled packets will be rejected.
 This is because we enforce policy check on inner packet on reception,
 and AH authenticates encapsulating
-.Pq outer
+(outer)
 packet, not the encapsulated
-.Pq inner
+(inner)
 packet
-.Po
-so for the receiving kernel there's no sign of authenticity
-.Pc .
+(so for the receiving kernel there's no sign of authenticity).
 The issue will be solved when we revamp our policy engine to keep all the
 packet decapsulation history.
 .Pp
diff --git a/share/man/man4/kame.4 b/share/man/man4/kame.4
index a4a0b17..e0f385c 100644
--- a/share/man/man4/kame.4
+++ b/share/man/man4/kame.4
@@ -39,13 +39,14 @@
 software package is a result of joint work of several IPv6 researchers
 in Japan, to provide reference implementation of IPv6 to
 Berkeley Software Distribution
-.Pq BSD
-derived system such as BSD/OS,
+.Pq Bx
+derived system such as
+.Bsx ,
 .Fx ,
 .Nx
 and
 .Ox
-.Pq in alphabetical order .
+(in alphabetical order).
 .Pp
 .\" Package consists of set of patches and additions to kernel,
 .\" modification to application, daemons, header files and libraries.
@@ -148,11 +149,9 @@ You also can check out the IPv6 and IPsec chapters in the
 handbook.
 Also check latest status of project at web page:
 .Pa http://www.kame.net/ .
-.Po
-Hope you can see a
+(Hope you can see a
 .Dq Dancing Turtle
-.Li :-)
-.Pc
+.Li :-) )
 .\"
 .Ss APIs introduced or modified
 .Xr if_indextoname 3 ,
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index a19cb7f..949673c 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -64,7 +64,7 @@ Control execution of HLT in the kernel context switch routine.
 Get per battery information.
 .Pp
 Some APM implementations execute the HLT
-.Pq Halt CPU until an interrupt occurs
+(Halt CPU until an interrupt occurs)
 instruction in the
 .Dq Em Idle CPU
 call, while others do not.  Thus enabling this may result in
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 398e0bf..0e085c8 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -38,7 +38,7 @@ The special file
 .Pa /dev/io
 is a controlled security hole that allows a process to gain I/O
 privileges
-.Pq which are normally reserved for kernel-internal code .
+(which are normally reserved for kernel-internal code).
 Any process that holds a file descriptor on
 .Pa /dev/io
 open will get its
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 3dc8cb0..64b2748 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -133,10 +133,12 @@ The
 driver accepts the following driver flag.
 Set it in the
 kernel configuration file
-.Pq see Xr config 8
+(see
+.Xr config 8 )
 or in the User Configuration Menu at
 the boot time
-.Pq see Xr boot 8 .
+(see
+.Xr boot 8 ) .
 .Pp
 .Bl -tag -width MOUSE
 .It bit 4..7 ACCELERATION
@@ -260,7 +262,8 @@ is always set to -1.
 The
 .Dv accelfactor
 field holds a value to control acceleration feature
-.Pq see Sx Acceleration .
+(see
+.Sx Acceleration ) .
 It is zero or greater.
 If it is zero, acceleration is disabled.
 .Pp
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index add327c..e0d18a9 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -70,10 +70,8 @@ to be also configured in the kernel.
 Almost full DEC
 .Tn VT220
 functionality
-.Po
-moving towards
-.Tn VT320
-.Pc
+(moving towards
+.Tn VT320 )
 .It
 Completely independent virtual terminals for MDA/HGC/CGA/EGA and VGA
 .It
@@ -97,11 +95,9 @@ Support for MDA, CGA, EGA and VGA display adaptors
 Support for 132 column operation on some VGA chipsets
 .It
 X Window Support for XFree86
-.Po
-requires
+(requires
 .Em XSERVER
-to be defined
-.Pc
+to be defined)
 .El
 .Pp
 What it cannot:
@@ -121,7 +117,7 @@ No VT52 support at all
 No 8-bit controls
 .It
 Only limited AT-keyboard
-.Pq 84 keys
+(84 keys)
 support
 .El
 .Ss Scrollback
@@ -156,7 +152,7 @@ in the kernel source tree for detailed documentation.
 .Pp
 Note: the following conventions apply to all the Boolean options.
 If an option is given with no value, a value of 1
-.Pq activated
+(activated)
 is substituted.
 If an option value is given as 0, this options is
 deactivated.
@@ -188,7 +184,7 @@ Default: on
 If enabled, a blinking-star screensaver is used.
 If disabled, the screen
 is simply blanked
-.Pq which might be useful for energy-saving monitors .
+(which might be useful for energy-saving monitors).
 .Pp
 Default: on
 .It Em PCVT_CTRL_ALT_DEL
@@ -205,9 +201,7 @@ Do NOT override a security lock for the keyboard.
 Default: on
 .It Em PCVT_24LINESDEF
 If enabled, the 25-line modi
-.Po
-VT emulation with 25 lines, and HP emulation with 28 lines
-.Pc
+(VT emulation with 25 lines, and HP emulation with 28 lines)
 default to 24 lines only to provide a better compatibility to the
 original DEV VT220 (TM). Thus it should be possible to use the
 terminal information for those terminals without further changes.
@@ -413,7 +407,7 @@ Since the
 .Sq native character set
 of any IBM-compatible PC video board does not allow the full interpretation
 of DEC multinational character set or ISO Latin-1
-.Pq ISO 8859-1 ,
+(ISO 8859-1),
 this might be very useful for a U**X environment.
 .Pp
 .Bl -tag -width 20n -offset indent -compact
@@ -466,7 +460,7 @@ CH_SET4, CH_SET5, CH_SET6, or CH_SET7, too.
 .Pp
 Note that there's a dependence between the font size
 and a possible screen height
-.Pq in character rows ,
+(in character rows),
 depending on the video adaptor used:
 .Bd -literal
 Screen size (rows) on:          EGA             VGA
@@ -561,7 +555,8 @@ Note that setting the number of columns to 132 is only supported on
 some VGA adaptors.
 Any unsupported numbers cause the ioctl to fail with
 .Va errno
-.Pq see Xr intro 2
+(see
+.Xr intro 2 )
 being set to
 .Er EINVAL .
 .Pp
@@ -689,7 +684,7 @@ Device nodes to access the
 .Nm
 driver
 .It Pa i386/isa/pcvt/pcvt_conf.h
-.Pq relative to the kernel source tree
+(relative to the kernel source tree)
 Documents the various compile-time options to tailor
 .Nm .
 .El
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 8bff201..356b808 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -67,12 +67,14 @@ The
 .Nm
 driver allows the user to initially set the resolution
 via the driver flag
-.Pq see Sx DRIVER CONFIGURATION
+(see
+.Sx "DRIVER CONFIGURATION" )
 or change it later via the
 .Xr ioctl 2
 command
 .Dv MOUSE_SETMODE
-.Pq see Sx IOCTLS .
+(see
+.Sx IOCTLS ) .
 .Ss Report Rate
 Frequency, or report rate, at which the device sends movement
 and button state reports to the host system is also configurable.
@@ -92,7 +94,8 @@ At the level zero the basic support is provided; the device driver will report
 horizontal and vertical movement of the attached device
 and state of up to three buttons.
 The movement and status are encoded in a series of fixed-length data packets
-.Pq see Sx Data Packet Format .
+(see
+.Sx "Data Packet Format" ) .
 This is the default level of operation and the driver is initially
 at this level when opened by the user program.
 .Pp
@@ -191,7 +194,8 @@ There are following kernel configuration options to control the
 .Nm
 driver.
 They may be set in the kernel configuration file
-.Pq see Xr config 8 .
+(see
+.Xr config 8 ) .
 .Bl -tag -width MOUSE
 .It Em KBD_RESETDELAY=X , KBD_MAXWAIT=Y
 The
@@ -229,7 +233,8 @@ driver accepts the following driver flags.
 Set them in the
 kernel configuration file or in the User Configuration Menu at
 the boot time
-.Pq see Xr boot 8 .
+(see
+.Xr boot 8 ) .
 .Pp
 .Bl -tag -width MOUSE
 .It bit 0..3 RESOLUTION
@@ -484,7 +489,8 @@ Typical resolutions are:
 The
 .Dv accelfactor
 field holds a value to control acceleration feature
-.Pq see Sx Acceleration .
+(see
+.Sx Acceleration ) .
 It must be zero or greater.  If it is zero, acceleration is disabled.
 .Pp
 The
@@ -648,7 +654,8 @@ for known IDs.
 At debug level 1 more information will be logged
 while the driver probes the auxiliary port (mouse port).
 Messages are logged with the LOG_KERN facility at the LOG_DEBUG level
-.Pq see Xr syslogd 8 .
+(see
+.Xr syslogd 8 ) .
 .Bd -literal -offset indent
 psm0: current command byte:xxxx
 kbdio: TEST_AUX_PORT status:0000
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 19d36a2..e4a2ee0 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -84,7 +84,8 @@ If the standard VGA video mode is used,
 the size of the bitmap must be 320x200 or less.
 If you enable the VESA mode support in the kernel,
 either by statically linking the VESA module or by loading the VESA module
-.Pq see Xr vga 4 ,
+(see
+.Xr vga 4 ) ,
 you can load bitmaps up to a resolution of 1024x768, depending on the VESA
 BIOS and the amount of video memory on the video card.
 .Ss Screen saver
@@ -145,7 +146,9 @@ on the AT 84 keyboard.
 You can change the
 .Ar saver
 key by modifying the keymap
-.Pq see Xr kbdcontrol 1 , Xr keymap 5 ,
+(see
+.Xr kbdcontrol 1 ,
+.Xr keymap 5 ) ,
 and assign the
 .Ar saver
 function to a key of your preference.
@@ -179,7 +182,8 @@ have the following line in the kernel configuration file.
 .Pp
 Next, edit
 .Pa /boot/loader.conf
-.Pq see Xr loader.conf 5
+(see
+.Xr loader.conf 5 )
 and include the following lines:
 .Bd -literal -offset indent
 splash_bmp_load="YES"
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index c5f05e3..94d6d63 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -53,17 +53,15 @@ interface.
 The
 .Nm
 interface is necessary for site border router
-.Po
-called
+(called
 .Dq 6to4 router
-in the specification
-.Pc .
+in the specification).
 .Pp
 Due to the way 6to4 protocol is specified,
 .Nm
 interface requires certain configuration to work properly.
 Single
-.Pq no more than 1
+(no more than 1)
 valid 6to4 address needs to be configured to the interface.
 .Dq A valid 6to4 address
 is an address which has the following properties.
@@ -83,9 +81,9 @@ Since the specification forbids the use of IPv4 private address,
 the address needs to be a global IPv4 address.
 .It
 Subnet identifier portion
-.Pq 48th to 63rd bit
+(48th to 63rd bit)
 and interface identifier portion
-.Pq lower 64 bits
+(lower 64 bits)
 are properly filled to avoid address collisions.
 .El
 .Pp
@@ -182,7 +180,8 @@ The following configuration accepts packets from IPv4 source
 .Li 9.1.0.0/16
 only.
 It emits 6to4 packet only for IPv6 destination 2002:0901::/32
-.Pq IPv4 destination will match Li 9.1.0.0/16 .
+(IPv4 destination will match
+.Li 9.1.0.0/16 ) .
 .Bd -literal
 # ifconfig ne0 inet 9.1.2.3 netmask 0xffff0000
 # ifconfig stf0 inet6 2002:0901:0203:0000:a00:5aff:fe38:6f86 \\
@@ -193,12 +192,12 @@ The following configuration uses the
 .Nm
 interface as an output-only device.
 You need to have alternative IPv6 connectivity
-.Pq other than 6to4
+(other than 6to4)
 to use this configuration.
 For outbound traffic, you can reach other 6to4 networks efficiently via
 .Nm stf .
 For inbound traffic, you will not receive any 6to4-tunneled packets
-.Pq less security drawbacks .
+(less security drawbacks).
 Be careful not to advertise your 6to4 prefix to others
 .Pq Li 2002:8504:0506::/48 ,
 and not to use your 6to4 prefix as a source.
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 2b05dc3..ca685e4 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -363,10 +363,12 @@ The following driver flags can be used to control the
 .Nm
 driver.
 They can be set either in the kernel configuration file
-.Pq see Xr config 8 ,
+(see
+.Xr config 8 ) ,
 or else in the User Configuration Menu at boot
 time
-.Pq see Xr boot 8 .
+(see
+.Xr boot 8 ) .
 .Bl -tag -width bit_0
 .\".It bit 0 (VISUAL_BELL)
 .\"Uses the ``visual'' bell.
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index 0e9493a..6174554 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -44,7 +44,8 @@ supplies mouse data to the user process in the standardized way via the
 .Nm
 driver.
 This arrangement makes it possible for the console and the user process
-.Pq such as the Tn X\ Window System
+(such as the
+.Tn X\ Window System )
 to share the mouse.
 .Pp
 The user process which wants to utilize mouse operation simply opens
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index fecd0a2..48f2bc3 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -56,7 +56,7 @@ the control device
 there);
 writing an Ethernet frame to the control device generates an input frame on
 the network interface, as if the
-.Pq non-existent
+(non-existent)
 hardware had just received it.
 .Pp
 The Ethernet tunnel device, normally
@@ -91,14 +91,15 @@ amount of data provided to
 .Fn write .
 Writes will not block; if the frame cannot be accepted
 for a transient reason
-.Pq e.g., no buffer space available ,
+(e.g., no buffer space available),
 it is silently dropped; if the reason is not transient
-.Pq e.g., frame too large ,
+(e.g., frame too large),
 an error is returned.
 The following
 .Xr ioctl 2
 calls are supported
-.Pq defined in Aq Pa net/if_tap.h Ns :
+(defined in
+.Aq Pa net/if_tap.h ) :
 .Bl -tag -width VMIO_SIOCSETMACADDR
 .It Dv TAPSDEBUG
 The argument should be a pointer to an
@@ -114,7 +115,7 @@ this stores the internal debugging variable's value into it.
 Turn non-blocking I/O for reads off or on, according as the argument
 .Va int Ns 's
 value is or isn't zero
-.Pq Writes are always nonblocking .
+(Writes are always nonblocking).
 .It Dv FIOASYNC
 Turn asynchronous I/O for reads
 (i.e., generation of
@@ -171,7 +172,8 @@ address of the
 .Dq remote
 side. This command is used by VMware port and expected to be executed on
 a descriptor, associated with control device
-.Pq usually Pa /dev/vmnet Ns Sy N .
+(usually
+.Pa /dev/vmnet Ns Sy N ) .
 .El
 .Pp
 The control device also supports
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 44edef3..e7bb8cd 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -76,7 +76,8 @@ module can be dynamically loaded into the kernel using
 .Sh DRIVER CONFIGURATION
 .Ss Kernel Configuration Options
 The following kernel configuration options
-.Pq see Xr config 8
+(see
+.Xr config 8 )
 can be used to control the
 .Nm
 driver.
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index a659ba7..027cf96 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -402,11 +402,9 @@ field hold one of two values:
 .Dv AUX_FUNC
 and
 .Dv AUX_OBJECT
-.Po
-see
+(see
 .Aq Pa link.h
-for their definitions
-.Pc .
+for their definitions).
 .Dv AUX_FUNC
 associates the symbol with a callable function, while
 .Dv AUX_OBJECT
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 85c0e27..199591e 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -196,10 +196,8 @@ The location of the Procedure Linkage Table within this image.
 The location of an array of
 .Fa relocation_info
 structures
-.Po
-see
-.Xr a.out 5
-.Pc
+(see
+.Xr a.out 5 )
 specifying run-time relocations.
 .It Fa sdt_hash
 The location of the hash table for fast symbol lookup in this object's
@@ -227,10 +225,8 @@ A
 structure describes a shared object that is needed
 to complete the link edit process of the object containing it.
 A list of such objects
-.Po
-chained through
-.Fa sod_next
-.Pc
+(chained through
+.Fa sod_next )
 is pointed at
 by the
 .Fa sdt_sods
@@ -256,10 +252,8 @@ specifies a library that is to be searched for by
 .Nm ld.so .
 The path name
 is obtained by searching a set of directories
-.Po
-see also
-.Xr ldconfig 8
-.Pc
+(see also
+.Xr ldconfig 8 )
 for a shared object matching
 .Em lib\&<sod_name>\&.so.n.m .
 If not set,
@@ -340,10 +334,8 @@ struct nzlist {
 .Ed
 .Bl -tag -width nz_size
 .It Fa nlist
-.Po
-see
-.Xr nlist 3
-.Pc .
+(see
+.Xr nlist 3 ) .
 .It Fa nz_size
 The size of the data represented by this symbol.
 .El
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index b30ad8f..39fc21d 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -346,10 +346,8 @@ Set to
 .Dq YES
 if you want to run
 .Xr df 1
-.Po
-with the arguments supplied in
-.Va daily_status_disks_df_flags
-.Pc
+(with the arguments supplied in
+.Va daily_status_disks_df_flags )
 and
 .Ic dump -W .
 .It Va daily_status_disks_df_flags
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 06bbad4..05b8b9e 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -168,11 +168,9 @@ if you are not running NIS.
 .It Va dhcp_program
 .Pq Vt str
 Path to the DHCP client program
-.Po
-.Pa /sbin/dhclient ,
+.Pa ( /sbin/dhclient ,
 the ISC DHCP client,
-is the default
-.Pc .
+is the default).
 .It Va dhcp_flags
 .Pq Vt str
 Additional flags to pass to the DHCP client program.
@@ -1681,10 +1679,8 @@ at system boot time.
 .It Va sshd_program
 .Pq Vt str
 Path to the SSH server program
-.Po
-.Pa /usr/sbin/sshd
-is the default
-.Pc .
+.Pa ( /usr/sbin/sshd
+is the default).
 .It Va sshd_enable
 .Pq Vt bool
 Set to
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index c495c7c..52444d9 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -85,7 +85,7 @@ The following targets will be run automatically by each proceeding
 target in order.  That is,
 .Ar build
 will be run
-.Pq if necessary
+(if necessary)
 by
 .Ar install ,
 and so on all the way to
@@ -108,7 +108,7 @@ Defining
 will skip this step.
 .It Ar depends
 Install
-.Pq or compile if only compilation is necessary
+(or compile if only compilation is necessary)
 any dependencies of the current port.  When called by the
 .Ar extract
 or
@@ -160,7 +160,7 @@ portion recurses to dependencies unless
 is defined, but the
 .Sq distclean
 portion never recurses
-.Pq this is perhaps a bug .
+(this is perhaps a bug).
 .It Ar reinstall
 Use this to restore a port after using
 .Xr pkg_delete 1
@@ -258,12 +258,10 @@ The full path to the package.
 .El
 .It Ev PREFIX
 Where to install things in general
-.Po
-usually
+(usually
 .Pa /usr/local
 or
-.Pa /usr/X11R6
-.Pc
+.Pa /usr/X11R6 )
 .It Ev MASTER_SITES
 Primary sites for distribution files if not found locally.
 .It Ev PATCH_SITES
@@ -295,11 +293,9 @@ If defined, only operate on a port if it can be installed 100% automatically.
 .Bl -tag -width /usr/ports/xxxx -compact
 .It Pa /usr/ports
 The default ports directory
-.Po
-.Fx
+.No ( Fx
 and
-.Ox
-.Pc .
+.Ox ) .
 .It Pa /usr/pkgsrc
 The default ports directory (NetBSD).
 .It Pa /usr/ports/Mk/bsd.port.mk
@@ -324,7 +320,7 @@ The
 handbook
 .Pp
 http://www.FreeBSD.org/ports
-.Pq searchable index of all ports
+(searchable index of all ports)
 .Sh AUTHORS
 .An -nosplit
 This man page was originated by
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 187c8b6..a58e5e4 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -37,10 +37,8 @@ detection is one of the single most important aspects of any security
 mechanism.  For example, it makes little sense to set the
 .Pa schg
 flags
-.Po
-see
-.Xr chflags 1
-.Pc
+(see
+.Xr chflags 1 )
 on every system binary because while this may temporarily protect the
 binaries, it prevents a hacker who has broken in from making an
 easily detectable change that may result in your security mechanisms not
@@ -81,9 +79,7 @@ sysadmins still run standard telnetd, rlogind, rshd, and ftpd servers on their
 machines.  These servers, by default, do not operate over encrypted
 connections.  The result is that if you have any moderate-sized user base,
 one or more of your users logging into your system from a remote location
-.Po
-which is the most common and convenient way to login to a system
-.Pc
+(which is the most common and convenient way to login to a system)
 will
 have his or her password sniffed.  The attentive system admin will analyze
 his remote access logs looking for suspicious source addresses
@@ -157,7 +153,8 @@ Of course, as a sysadmin you have to be able to get to root, so we open up
 a few holes.  But we make sure these holes require additional password
 verification to operate.  One way to make root accessible is to add appropriate
 staff accounts to the wheel group
-.Pq in Pa /etc/group .
+(in
+.Pa /etc/group ) .
 The staff members placed
 in the wheel group are allowed to
 .Sq su
@@ -194,7 +191,7 @@ key pair.  When you use something like kerberos you generally must secure
 the machines which run the kerberos servers and your desktop workstation.
 When you use a public/private key pair with ssh, you must generally secure
 the machine you are logging in FROM
-.Pq typically your workstation ,
+(typically your workstation),
 but you can
 also add an additional layer of protection to the key pair by password
 protecting the keypair when you create it with
@@ -228,7 +225,7 @@ changing a password on N machines can be a mess.  You can also impose
 re-passwording restrictions with kerberos:  not only can a kerberos ticket
 be made to timeout after a while, but the kerberos system can require that
 the user choose a new password after a certain period of time
-.Pq say, once a month .
+(say, once a month).
 .Sh SECURING ROOT - ROOT-RUN SERVERS AND SUID/SGID BINARIES
 The prudent sysadmin only runs the servers he needs to, no more, no less.  Be
 aware that third party servers are often the most bug-prone.  For example,
@@ -260,7 +257,7 @@ There are a number of other servers that typically do not run in sandboxes:
 sendmail, popper, imapd, ftpd, and others.  There are alternatives to
 some of these, but installing them may require more work then you are willing
 to put
-.Pq the convenience factor strikes again .
+(the convenience factor strikes again).
 You may have to run these
 servers as root and rely on other mechanisms to detect break-ins that might
 occur through them.
@@ -277,12 +274,12 @@ While nothing is 100% safe,
 the system-default suid and sgid binaries can be considered reasonably safe.
 Still, root holes are occasionally found in these binaries.  A root hole
 was found in Xlib in 1998 that made xterm
-.Pq which is typically suid
+(which is typically suid)
 vulnerable.
 It is better to be safe then sorry and the prudent sysadmin will restrict suid
 binaries that only staff should run to a special group that only staff can
 access, and get rid of
-.Pq chmod 000
+.Pq Li "chmod 000"
 any suid binaries that nobody uses.  A
 server with no display generally does not need an xterm binary.  Sgid binaries
 can be almost as dangerous.  If an intruder can break an sgid-kmem binary the
@@ -319,11 +316,9 @@ attacker cannot obtain root-write access.
 .Pp
 Your security scripts should always check for and report changes to
 the password file
-.Po
-see
+(see
 .Sq Checking file integrity
-below
-.Pc .
+below).
 .Sh SECURING THE KERNEL CORE, RAW DEVICES, AND FILESYSTEMS
 If an attacker breaks root he can do just about anything, but there
 are certain conveniences.  For example, most modern kernels have a
@@ -442,19 +437,15 @@ idea.  The
 and
 .Sq nosuid
 options
-.Po
-see
-.Xr mount 8
-.Pc
+(see
+.Xr mount 8 )
 are what you want to look into.  I would scan them anyway at least once a
 week, since the object of this layer is to detect a break-in whether or
 not the breakin is effective.
 .Pp
 Process accounting
-.Po
-see
-.Xr accton 8
-.Pc
+(see
+.Xr accton 8 )
 is a relatively low-overhead feature of
 the operating system which I recommend using as a post-break-in evaluation
 mechanism.  It is especially useful in tracking down how an intruder has
@@ -493,10 +484,8 @@ Kernel Route Cache
 A common DOS attack is against a forking server that attempts to cause the
 server to eat processes, file descriptors, and memory until the machine
 dies.  Inetd
-.Po
-see
-.Xr inetd 8
-.Pc
+(see
+.Xr inetd 8 )
 has several options to limit this sort of attack.
 It should be noted that while it is possible to prevent a machine from going
 down it is not generally possible to prevent a service from being disrupted
@@ -557,7 +546,7 @@ firewall everything *except* ports A, B, C, D, and M-Z
 This
 way you can firewall off all of your low ports except for certain specific
 services such as named
-.Pq if you are primary for a zone ,
+(if you are primary for a zone),
 ntalkd, sendmail,
 and other internet-accessible services.
 If you try to configure the firewall the other
@@ -572,15 +561,13 @@ without compromising your low ports.  Also take note that
 allows you to
 control the range of port numbers used for dynamic binding via the various
 net.inet.ip.portrange sysctl's
-.Pq sysctl -a \&| fgrep portrange ,
+.Pq Li "sysctl -a | fgrep portrange" ,
 which can also
 ease the complexity of your firewall's configuration.  I usually use a normal
 first/last range of 4000 to 5000, and a hiport range of 49152 to 65535, then
 block everything under 4000 off in my firewall
-.Po
-except for certain specific
-internet-accessible ports, of course
-.Pc .
+(except for certain specific
+internet-accessible ports, of course).
 .Pp
 Another common DOS attack is called a springboard attack - to attack a server
 in a manner that causes the server to generate responses which then overload
@@ -628,7 +615,7 @@ If your servers are connected to the internet via a T3 or better it may be
 prudent to manually override both rtexpire and rtminexpire via
 .Xr sysctl 8 .
 Never set either parameter to zero
-.Pq unless you want to crash the machine :-) .
+(unless you want to crash the machine :-)).
 Setting both parameters to 2 seconds should be sufficient to protect the route
 table from attack.
 .Sh ACCESS ISSUES WITH KERBEROS AND SSH
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 0047c26..6e9e93e 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -64,7 +64,7 @@ driver.
 .It Dv CD_Q_BCD_TRACKS
 This flag is for broken drives that return the track numbers in packed BCD
 instead of straight decimal.  If the drive seems to skip tracks
-.Pq tracks 10-15 are skipped
+(tracks 10-15 are skipped)
 then you have a drive that is in need of this flag.
 .It Dv CD_Q_NO_CHANGER
 This flag tells the driver that the device in question is not a changer.
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index dab3a76..b015ba0 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -628,11 +628,9 @@ The local address of the interface.
 .Pq Li "struct sockaddr *"
 The remote address of point-to-point interfaces, and the broadcast
 address of broadcast interfaces.
-.Po
-.Li ifa_broadaddr
+.Li ( ifa_broadaddr
 is a macro for
-.Li ifa_dstaddr .
-.Pc
+.Li ifa_dstaddr . )
 .It Li ifa_netmask
 .Pq Li "struct sockaddr *"
 The network mask for multi-access interfaces, and the confusion
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 5ff0c5e..985b452 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -114,7 +114,7 @@
 An mbuf is a basic unit of memory management in the kernel IPC subsystem.
 Network packets and socket buffers are stored in mbufs.
 A network packet may span multiple mbufs arranged into a chain
-.Pq linked list ,
+(linked list),
 which allows adding or trimming
 network headers with little overhead.
 .Pp
@@ -279,10 +279,8 @@ is set to
 a failed allocation will result in the caller being put
 to sleep for a designated
 kern.ipc.mbuf_wait
-.Po
-.Xr sysctl 8
-tunable
-.Pc
+.Xr ( sysctl 8
+tunable)
 number of ticks.
 A number of other mbuf-related
 functions and macros have the same argument because they may
@@ -303,7 +301,7 @@ This macro operates on an mbuf chain.
 It is an optimized wrapper for
 .Fn m_prepend
 that can make use of possible empty space before data
-.Pq "e.g. left after trimming of a link-layer header" .
+(e.g. left after trimming of a link-layer header).
 The new chain pointer or
 .Dv NULL
 is in
@@ -404,7 +402,7 @@ so they are accessible with
 Return the new chain on success,
 .Dv NULL
 on failure
-.Pq the chain is freed in this case .
+(the chain is freed in this case).
 .Sy Note :
 It doesn't allocate any clusters, so
 .Fa len
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index 85f69d1..7c11f8d 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -74,7 +74,7 @@ voluntarily relinquishes the CPU to wait for some resource to become
 available.
 .It
 after handling a trap
-.Pq e.g. a system call, device interrupt
+(e.g. a system call, device interrupt)
 when the kernel prepares a return to user-mode execution.
 This case is
 typically handled by machine dependent trap-handling code after detection
@@ -86,7 +86,8 @@ the machine defined
 .Fn need_resched .
 .It
 in the signal handling code
-.Pq see Xr issignal 9
+(see
+.Xr issignal 9 )
 if a signal is delivered that causes a process to stop.
 .El
 .Pp
@@ -94,7 +95,8 @@ if a signal is delivered that causes a process to stop.
 records the amount of time the current process has been running in the
 process structure and checks this value against the CPU time limits
 allocated to the process
-.Pq see Xr getrlimit 2 .
+(see
+.Xr getrlimit 2 ) .
 Exceeding the soft limit results in a
 .Dv SIGXCPU
 signal to be posted to the process, while exceeding the hard limit will
diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9
index c628bc1..da0e993 100644
--- a/share/man/man9/psignal.9
+++ b/share/man/man9/psignal.9
@@ -83,14 +83,15 @@ The target process is currently ignoring the signal.
 .It
 If a stop signal is sent to a sleeping process that takes the
 default action
-.Pq see Xr sigaction 2 ,
+(see
+.Xr sigaction 2 ) ,
 the process is stopped without awakening it.
 .It
 .Dv SIGCONT
 restarts a stopped process
-.Pq or puts them back to sleep
+(or puts them back to sleep)
 regardless of the signal action
-.Pq e.g., blocked or ignored .
+(e.g., blocked or ignored).
 .El
 .Pp
 If the target process is being traced
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 366101d..3aa8080 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -109,7 +109,8 @@ is returned if the current system call should be restarted if
 possible, and
 .Er EINTR
 is returned if the system call should be interrupted by the signal
-.Pq return Er EINTR .
+(return
+.Er EINTR ) .
 .Pp
 .Nm Msleep
 is a variation on tsleep.  The parameter
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index bb034bc..643912f 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -133,11 +133,9 @@ all in lowercase and the macro has the same name all in uppercase.
 .\" functions are used.
 If a
 macro needs more than a single line, use braces
-.Po
-.Sq \&{
+.Sq ( \&{
 and
-.Sq \&}
-.Pc .
+.Sq \&} ) .
 Right-justify the
 backslashes; it makes it easier to read.
 If the macro encapsulates a compound statement, enclose it in a
@@ -528,11 +526,9 @@ The usage statement should be structured in the following order:
 Options without operands come first,
 in alphabetical order,
 inside a single set of brackets
-.Po
-.Sq \&[
+.Sq ( \&[
 and
-.Sq \&]
-.Pc .
+.Sq \&] ) .
 .It
 Options with operands come next,
 also in alphabetical order,
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index dcca69e..669ba00 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -1112,9 +1112,9 @@ Terminals that use
 .Dq %.\&
 need to be able to
 backspace the cursor
-.Po Sy \&le Pc
+.Pq Sy \&le
 and to move the cursor up one line on the screen
-.Po Sy \&up Pc .
+.Pq Sy \&up .
 This is necessary because it is not always safe to transmit
 .Sy \&\en ,
 .Sy \&^D ,
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index e8bdefd..aa804db 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -170,12 +170,10 @@ Mainly useful for debugging when the log file is viewed continuously with
 .It Dv PKT_ALIAS_DENY_INCOMING
 If this mode bit is set, all incoming packets associated with new TCP
 connections or new UDP transactions will be marked for being ignored
-.Po
-.Fn PacketAliasIn
+.Fn ( PacketAliasIn
 returns
 .Dv PKT_ALIAS_IGNORED
-code
-.Pc
+code)
 by the calling program.
 Response packets to connections or transactions initiated from the packet
 aliasing host or local network will be unaffected.
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 403bb4b..68ef5a9 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -84,7 +84,8 @@ Show only what would be done, but do not send any signal.
 Send a different signal instead of the default
 .Dv TERM .
 The signal may be specified either as a name
-.Pq with \&or without a leading Dv SIG ,
+(with or without a leading
+.Dv SIG ) ,
 or numerically.
 .It Fl u Ar user
 Limit potentially matching processes to those belonging to
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index b261f7b..84edece 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -55,14 +55,12 @@ and contains the pathnames
 of all files which are publicly accessible.
 .Pp
 Shell globbing and quoting characters
-.Po
-.Dq * ,
+.Dq ( * ,
 .Dq \&? ,
 .Dq \e ,
 .Dq \&[
 and
-.Dq \&]
-.Pc
+.Dq \&] )
 may be used in
 .Ar pattern  ,
 although they will have to be escaped from the shell.
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index becc241..8e0ac07 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -134,9 +134,7 @@ to save all or part of the pattern space for subsequent retrieval.
 An address is not required, but if specified must be a number (that counts
 input lines
 cumulatively across input files), a dollar
-.Po
-.Dq $
-.Pc
+.Pq Dq $
 character that addresses the last line of input, or a context address
 (which consists of a regular expression preceded and followed by a
 delimiter).
@@ -161,9 +159,7 @@ starts looking again for the first address.
 .Pp
 Editing commands can be applied to non-selected pattern spaces by use
 of the exclamation character
-.Po
-.Dq \&!
-.Pc
+.Pq Dq \&!
 function.
 .Sh "Sed Regular Expressions"
 The regular expressions used in
@@ -182,9 +178,7 @@ has the following two additions to regular expressions:
 .Bl -enum -compact
 .It
 In a context address, any character other than a backslash
-.Po
-.Dq \e
-.Pc
+.Pq Dq \e
 or newline character may be used to delimit the regular expression.
 Also, putting a backslash character before the delimiting character
 causes the character to be treated literally.
@@ -400,9 +394,7 @@ Within the RE and the replacement, the RE delimiter itself can be used as
 a literal character if it is preceded by a backslash.
 .Pp
 An ampersand
-.Po
-.Dq &
-.Pc
+.Pq Dq &
 appearing in the replacement is replaced by the string matching the RE.
 The special meaning of
 .Dq &
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index ade98e4..d3e0432 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -632,10 +632,10 @@ with
 obvious meanings, or it can be a numeric expression,
 in which case a non-zero value is true.
 .Bl -tag -width Fl
-.It Xo
-.Ic alias Ns Po Bq Aq Ar string ,
-.Bq Aq Ar string\-list Pc
-.Xc
+.It Ic alias Ns Po
+.Bq Aq Ar string ,
+.Bq Aq Ar string\-list
+.Pc
 If no argument is given, all currently defined alias macros are
 listed.  Otherwise,
 .Aq Ar string
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index 5c6ca9b..299d6fe 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -48,12 +48,12 @@ command analyzes ACPI tables in physical memory and dumps them to standard outpu
 In addition,
 .Nm
 can disassemble some contents of the tables in AML
-.Pq ACPI Machine Language
+(ACPI Machine Language)
 and dump them in ASL
-.Pq ACPI Source Language .
+(ACPI Source Language).
 .Pp
 ACPI tables have an notably essential data block called DSDT
-.Pq Differentiated System Description Table ,
+(Differentiated System Description Table),
 that includes information used on the kernel side such as
 detail information about PnP hardware, procedures for controlling
 a power management support and so on.
@@ -71,12 +71,12 @@ and dump them.  First, it searches Root System Description Pointer,
 that has a signature
 .Qq RSD PTR\ \& ,
 and then gets RSDT
-.Pq Root System Description Table ,
+(Root System Description Table),
 which includes a list of pointers to physical memory addresses
 for other tables.
 RSDT itself and all other tables linked from RSDT are generically
 called SDT
-.Pq System Description Table
+(System Description Table)
 and their header has the common format which consists of items
 such as Signature, Length, Revision, Checksum, OEMID, OEM Table ID,
 OEM Revision, Creator ID and Creator Revision.
@@ -88,13 +88,13 @@ see chapter 5: ACPI Software Programming Model,
 from Intel/Microsoft/Toshiba.
 .Pp
 There is always a pointer to a physical memory address in RSDT for FACP
-.Pq Fixed ACPI Description Table .
+(Fixed ACPI Description Table).
 FACP defines static system information about power management support
-.Pq ACPI Hardware Register Implementation
+(ACPI Hardware Register Implementation)
 such as interrupt mode
-.Pq INT_MODEL ,
+(INT_MODEL),
 SCI interrupt number, SMI command port
-.Pq SMI_CMD
+(SMI_CMD)
 and location of ACPI registers.
 FACP also has a pointer to a physical memory address for DSDT,
 which includes information used on the kernel side such as
@@ -131,7 +131,7 @@ simultaneously on a machine that supports ACPI BIOS.
 In the current implementation,
 .Nm
 doesn't dump any information of Firmware ACPI Control Structure
-.Pq FACS
+(FACS)
 specified by a pointer in FACP.
 Some parts of output in ASL are incomplete.  To obtain a complete
 output, it would need to change the implementation into another one
diff --git a/usr.sbin/acpi/amldb/amldb.8 b/usr.sbin/acpi/amldb/amldb.8
index a253a21..d10e900 100644
--- a/usr.sbin/acpi/amldb/amldb.8
+++ b/usr.sbin/acpi/amldb/amldb.8
@@ -34,7 +34,7 @@
 .Sh NAME
 .Nm amldb
 .Nd executing and debugging AML interpreter
-.Pq with DSDT files
+(with DSDT files)
 .Sh SYNOPSIS
 .Nm
 .Op Fl dhst
@@ -42,10 +42,10 @@
 .Sh DESCRIPTION
 .Nm Amldb
 parses the DSDT
-.Pq Differentiated System Description Table
+(Differentiated System Description Table)
 files, which usually are acquired from ACPI BIOS, and executes
 the sequence of ACPI Control Methods described in AML
-.Pq ACPI Machine Language
+(ACPI Machine Language)
 with its AML interpreter.
 .Nm Amldb
 also has a simple ACPI virtual machine.  During execution of the
@@ -62,7 +62,7 @@ with ACPI BIOS through
 .Xr acpidump 8 .
 The DSDT is a table, a part of the whole ACPI memory table
 located in somewhere in the BIOS area
-.Pq 0xa0000 \- 0x100000 .
+.Pq Li 0xa0000 \- 0x100000 .
 It includes such information as the detailed hardware information
 for PnP, and the set of procedures which perform power management from
 the OS.  The information is stored in AML format.
@@ -71,7 +71,7 @@ The AML interpreter can execute any of the Control Methods specified
 by users.  When executed, it interprets the byte sequence in the
 Control Method of DSDT, and disassembles the opecodes that it
 recognizes into ASL
-.Pq ACPI Source Language
+(ACPI Source Language)
 format to be displayed.
 .Pp
 If it encounters one of more accesses to the region such as
@@ -197,7 +197,7 @@ Lists the named objects that includes the specified string as the
 terminate elements searching from the ACPI namespace.  For the
 namespace is expressed as the sequence of four-character elements,
 appropriate number of additional underscore
-.Pq Sq _
+.Pq Ql _
 characters are necessary for specifying objects which have less than four
 character string.  Unless additional underscores specified, matching
 occurs as the beginning of word with the specified number of characters.
@@ -232,10 +232,10 @@ The following is an example including, invoking the
 .Nm ,
 searching
 .Li _PRS
-.Pq Possible Resource Settings
+(Possible Resource Settings)
 objects, and executing the
 .Li _PTS
-.Pq Prepare To Sleep
+(Prepare To Sleep)
 Control Method by the AML interpreter.
 .Bd -literal -offset indent
 % amldb p2b.dsdt.dat
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index f11700a..3de23c8 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 .Nm Apmd
 monitors the occurrence of the specified Advanced Power Management
-.Pq APM
+.Pq Tn APM
 events and, if one of the events occurs, it executes the sequence of
 commands corresponding to the event.  Only the events specified in the
 configuration file are notified to
@@ -77,10 +77,8 @@ Verbose mode.
 When
 .Nm
 starts, it reads the configuration file
-.Po
-.Pa /etc/apmd.conf
-as default
-.Pc
+.Pa ( /etc/apmd.conf
+as default)
 and notifies the set of events to be monitored to the APM device driver.
 When it terminates, the APM device driver automatically cancels
 monitored events.
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 1bdc5f0..26f2bf8 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -158,4 +158,4 @@ The
 command and this manpage was contributed by
 .An S\(/oren Schmidt ,
 Denmark
-.Pq sos@FreeBSD.org .
+.Aq sos@FreeBSD.org .
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index a6053e1..e612a19 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -41,7 +41,7 @@ The CTM statements are as follows.
 This is the overall begin of a CTM delta file.  The
 .Ar version
 field must match the program version
-.Pq currently 2.0 .
+(currently 2.0).
 .Ar Name
 is the name and
 .Ar number
@@ -51,11 +51,9 @@ to see if the delta has already been applied.
 .Ar Timestamp
 contains the year, month, day, hour, minute, and second of the
 time of delta creation for reference
-.Po
-followed by the letter
+(followed by the letter
 .Sq Z
-meaning this is a UTC timestamp
-.Pc .
+meaning this is a UTC timestamp).
 The
 .Ar prefix
 field is currently not implemented.
@@ -69,13 +67,13 @@ Make the file
 .Ar name ,
 the original file had the uid
 .Ar uid
-.Pq numerical, decimal ,
+(numerical, decimal),
 the gid
 .Ar gid
-.Pq numerical, decimal ,
+(numerical, decimal),
 mode
 .Ar mode
-.Pq numerical, octal ,
+(numerical, octal),
 and the MD5 checksum
 .Ar md5 .
 .Pp
@@ -87,13 +85,13 @@ Substitute the contents of file
 .Ar name ,
 the original file had the new uid
 .Ar uid
-.Pq numerical, decimal ,
+(numerical, decimal),
 the new gid
 .Ar gid
-.Pq numerical, decimal ,
+(numerical, decimal),
 new mode
 .Ar mode
-.Pq numerical, octal ,
+(numerical, octal),
 the old MD5 checksum
 .Ar md5before ,
 and the new MD5 checksum
@@ -142,7 +140,7 @@ is to be removed.
 .Sh EXAMPLES
 In the following example, long lines have been folded to make them
 printable
-.Pq marked by backslashes .
+(marked by backslashes).
 .Bd -literal
 CTM_BEGIN 2.0 cvs-cur 485 19950324214652Z .
 CTMFR src/sys/gnu/i386/isa/scd.c,v 5225f13aa3c7e458f9dd0d4bb637b18d
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 9a51d76..160d54a 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -200,7 +200,7 @@ on client.
 Inactive sessions will be disconnected in 30 minutes,
 to avoid stale sessions from chewing up resources.
 This may be inappropriate for some of the services
-.Pq should this be configurable? .
+(should this be configurable?).
 .Ss inetd mode
 When
 .Nm
@@ -237,12 +237,10 @@ To prevent malicious accesses,
 implements a simple address-based access control.
 With
 .Pa /etc/faithd.conf
-.Po
-or
+(or
 .Ar configfile
 specified by
-.Fl f
-.Pc ,
+.Fl f ) ,
 .Nm
 will avoid relaying unwanted traffic.
 The
@@ -398,7 +396,7 @@ It is very insecure to use
 .Xr rhosts 5
 and other IP-address based authentication, for connections relayed by
 .Nm
-.Pq and any other TCP relaying services .
+(and any other TCP relaying services).
 .Pp
 Administrators are advised to limit accesses to
 .Nm
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index ac4e217..8d7e879 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -50,10 +50,8 @@ should be a character device.
 .Nm Fdcontrol
 currently supports the specification of device parameters for the
 floppy disk drive
-.Po
-.Fl s ,
-also default mode
-.Pc ,
+.Fl ( s ,
+also default mode),
 or it allows the modification of the driver debug level, in case the
 floppy driver has been compiled into the kernel with the
 .Em DEBUG
@@ -83,7 +81,7 @@ silly and likely to change in future, options should be provided to
 allow anything being modified from the command line.
 .Pp
 The driver does actually support only two debug levels
-.Pq 0 and 1 ,
+(0 and 1),
 where debug level 1 will generate huge amounts of output.
 It is likely
 to overflow the syslog if not used with extreme care.
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 339f0ea..e5ba6ce 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -54,9 +54,11 @@ formats a floppy disk at device
 .Ar Device_name
 may be given either with a full path
 name of a device node for a floppy disk drive
-.Pq e.g. Pa /dev/fd0 ,
+(e.g.\&
+.Pa /dev/fd0 ) ,
 or a default name in an abbreviated form
-.Pq e.g. Em fd0 .
+(e.g.\&
+.Em fd0 ) .
 In the latter case, the name is constructed by prepending
 .Pa /dev/
 and appending a
@@ -64,7 +66,7 @@ and appending a
 to the
 .Ar device_name .
 Note that any geometry constraints of the device node
-.Pq minor device number
+(minor device number)
 are meaningless, since they're overridden by
 .Nm .
 .Pp
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index b6f933d..53cdaac 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -28,7 +28,8 @@ Any floppy disk device capable of formatting can be used.
 .Pp
 .Nm Fdwrite
 will ask the user
-.Pq on /dev/tty
+(on
+.Pa /dev/tty )
 to insert a new floppy and press return.
 The device will then be opened, and queried for its parameters,
 then each track will be formatted, written with data from the
diff --git a/usr.sbin/gifconfig/gifconfig.8 b/usr.sbin/gifconfig/gifconfig.8
index ec04354..539b119 100644
--- a/usr.sbin/gifconfig/gifconfig.8
+++ b/usr.sbin/gifconfig/gifconfig.8
@@ -89,12 +89,10 @@ interfaces.
 .Pp
 Please note that it is very easy to create infinite routing loop,
 when you configure tunnel over same address family
-.Po
-e.g. IPv4-over-IPv4
-.Pc .
+(e.g. IPv4-over-IPv4).
 .Sh EXAMPLES
 If you would like to configure IPv6 over IPv4
-.Pq aka IPv6 in IPv4
+(aka IPv6 in IPv4)
 tunnel between
 .Li 10.1.1.1
 and
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 5ca2140..8ef617f 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -108,7 +108,8 @@ Set function key number
 to send
 .Ar string .
 Refer to the man page for the keyboard driver
-.Pq e.g. Xr atkbd 4
+(e.g.\&
+.Xr atkbd 4 )
 for available function keys and their numbers.
 .It Fl F
 Set function keys back to the standard definitions.
@@ -176,7 +177,9 @@ The keyboard device driver may let you change default configuration
 options, such as the default keyboard map, so that you do not need to set up
 the options at boot time.
 See keyboard driver manuals
-.Pq e.g. Xr atkbd 4 , Xr ukbd 4
+(e.g.\&
+.Xr atkbd 4 ,
+.Xr ukbd 4 )
 for details.
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index e036ab0..44b47cb 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -56,10 +56,8 @@ references were properly expanded
 references did not form a loop
 .It
 No two printers share the same spool directory
-.Po
-.Sq Li sd=
-capability
-.Pc .
+.Sq ( Li sd=
+capability).
 .El
 .Pp
 .Nm Chkprintcap
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index c81d70f..9c39fb3 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -73,7 +73,7 @@ variables
 .Ev LPDEST
 or
 .Ev PRINTER
-.Pq with this precedence
+(with this precedence)
 are taken as the destination printer.
 .It Fl n Ar num
 Specify that
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 5b6642a..5ef8063 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -63,7 +63,8 @@ and the console driver work together to support
 mouse operation in the text console and user programs.
 They virtualize the mouse and provide user programs with mouse data
 in the standard format
-.Pq see Xr sysmouse 4 .
+(see
+.Xr sysmouse 4 ) .
 .Pp
 The mouse daemon listens to the specified port for mouse data,
 interprets and then passes it via ioctls to the console driver.
@@ -113,7 +114,7 @@ to operate in the
 mode.
 .It Fl E Ar timeout
 When the third button emulation is enabled
-.Pq see above ,
+(see above),
 the
 .Nm
 daemon waits
@@ -245,7 +246,8 @@ Under normal circumstances,
 you need to use this option only if the
 .Nm
 command is not able to detect the protocol automatically
-.Pq see the Sx Configuring Mouse Daemon .
+(see the
+.Sx "Configuring Mouse Daemon" ) .
 .Pp
 Note that if a protocol type is specified with this option, the
 .Fl P
@@ -439,7 +441,8 @@ command with the
 option and see what it says.  If the command can identify
 the protocol type, no further investigation is necessary on your part.
 You may start the daemon without explicitly specifying a protocol type
-.Pq see Sx EXAMPLES .
+(see
+.Sx EXAMPLES ) .
 .Pp
 The command may print
 .Ar sysmouse
@@ -532,7 +535,8 @@ This is useful if the user wants to use the built-in PS/2 pointing device
 of a laptop computer while on the road, but wants to use a serial
 mouse when s/he attaches the system to the docking station in the office.
 Run two mouse daemons and tell the application program
-.Pq such as the X Window System
+(such as the
+.Tn "X\ Window System" )
 to use
 .Xr sysmouse ,
 then the application program will always see mouse data from either mice.
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 9ea9660..1f96902 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -90,7 +90,7 @@ Dump the currently existing NDP entries.
 .It Fl A Ar wait
 Repeat
 .Fl a
-.Pq dump NDP entries
+(dump NDP entries)
 every
 .Ar wait
 seconds.
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index 8657fd2..ee68258 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -122,7 +122,7 @@ font ram.
 This option is available only for EGA and VGA boards.
 .It Fl p
 Modify VGA palette
-.Pq DAC .
+(DAC).
 The
 .Fl p
 is mutually exclusive with
@@ -154,7 +154,7 @@ The first
 denotes the number of palette entry to be modified.
 This may be either
 a number between 0 and 255, or the usual name of an associated color
-.Pq case-insensitive .
+(case-insensitive).
 The following values for red, green and blue are restricted to 0 through 63
 due to VGA DAC conventions.
 Note that the first delimiter within such an argument may be a colon
@@ -185,7 +185,7 @@ option is only available if screen saver support has been compiled into
 the driver !
 .It Fl 1
 Sets 132 columns mode
-.Pq only available on VGA adaptors .
+(only available on VGA adaptors).
 .It Fl 8
 Sets 80 columns mode.
 .El
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index 3a211a3..657eba2 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -73,7 +73,8 @@ Symbolic register names look like:
 with
 .Aq Em regnumber
 being any hexadecimal number
-.Pq without a leading Em 0x ,
+(without a leading
+.Em 0x ) ,
 and
 .Aq Em reggroup
 one of the strings
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index f6d168e..29e7681 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -179,7 +179,8 @@ interactive prompt.
 .El
 .Pp
 One or more configuration entries or systems
-.Pq as specified in Pa /etc/ppp/ppp.conf
+(as specified in
+.Pa /etc/ppp/ppp.conf )
 may also be specified on the command line.
 .Nm
 will read the
@@ -506,7 +507,8 @@ Although not strictly relevant to
 .Nm Ns No 's
 operation, you should configure your resolver so that it works correctly.
 This can be done by configuring a local DNS
-.Pq using Xr named 8
+(using
+.Xr named 8 )
 or by adding the correct
 .Sq nameserver
 lines to the file
@@ -584,7 +586,8 @@ is) use much more reliable checking mechanisms.
 Parity has a relatively
 huge overhead (a 12.5% increase in traffic) and as a result, it is always
 disabled
-.Pq set to Dq none
+(set to
+.Dq none )
 when
 .Dv PPP
 is opened.
@@ -963,7 +966,8 @@ configuration by using the
 .Dq set server
 command in
 .Pa /etc/ppp/ppp.conf ,
-.Pq for example, Dq set server +3000 mypasswd
+(for example,
+.Dq Li "set server +3000 mypasswd" )
 and connecting to the diagnostic port as follows:
 .Bd -literal -offset indent
 # pppctl 3000	(assuming tun0)
@@ -1289,7 +1293,7 @@ Add either
 .Dq enable chap
 or
 .Dq enable pap
-.Pq or both
+(or both)
 to
 .Pa /etc/ppp/ppp.conf
 under the
@@ -1365,7 +1369,7 @@ authentication fails.
 .Pp
 If authentication is successful,
 .Ar hisaddr
-.Pq if specified
+(if specified)
 is used when negotiating IP numbers.
 See the
 .Dq set ifaddr
@@ -1551,7 +1555,8 @@ data does not have to be rearranged into packets.
 Care should be taken when adding a default route through a tunneled
 setup like this.
 It is quite common for the default route
-.Pq added in Pa /etc/ppp/ppp.linkup
+(added in
+.Pa /etc/ppp/ppp.linkup )
 to end up routing the link's TCP connection through the tunnel,
 effectively garrotting the connection.
 To avoid this, make sure you add a static route for the benefit of
@@ -1820,7 +1825,7 @@ ppp ON awfulhak> set timeout 600
 .Pp
 The timeout period is measured in seconds, the default value for which
 is 180 seconds
-.Pq or 3 min .
+(or 3 min).
 To disable the idle timer function, use the command
 .Bd -literal -offset indent
 ppp ON awfulhak> set timeout 0
@@ -1847,7 +1852,7 @@ By default,
 .Nm
 will attempt to use (or be willing to accept) both compression protocols
 when the peer agrees
-.Pq or requests them .
+(or requests them).
 The deflate protocol is preferred by
 .Nm .
 Refer to the
@@ -1861,7 +1866,7 @@ by using only one of
 .Dq disable deflate
 and
 .Dq deny deflate
-.Pq assuming that the peer supports both algorithms .
+(assuming that the peer supports both algorithms).
 .Pp
 By default, when negotiating DEFLATE,
 .Nm
@@ -2206,7 +2211,7 @@ to
 This tells
 .Nm
 to add a default route to whatever the peer address is
-.Pq 10.0.0.2 in this example .
+(10.0.0.2 in this example).
 This route is
 .Sq sticky ,
 meaning that should the value of
@@ -2436,7 +2441,8 @@ and
 commands.
 The
 .Sq authname
-.Pq and Sq authkey
+(and
+.Sq authkey )
 must be agreed in advance with the peer.
 .Pp
 Multi-link capabilities are enabled using the
@@ -2449,7 +2455,8 @@ will attempt to negotiate a multi-link connection with the peer.
 By default, only one
 .Sq link
 is available
-.Pq called Sq deflink .
+(called
+.Sq deflink ) .
 To create more links, the
 .Dq clone
 command is used.
@@ -2885,7 +2892,7 @@ Default: Enabled and Accepted.
 This option determines if
 .Nm
 will request and accept requests for short
-.Pq 12 bit
+(12 bit)
 sequence numbers when negotiating multi-link mode.
 This is only applicable if our MRRU is set (thus enabling multi-link).
 .It vjcomp
@@ -3113,7 +3120,8 @@ The option can only be enabled if network address translation is enabled
 With this option enabled,
 .Nm
 will pass traffic for old interface addresses through the NAT engine
-.Pq see Xr libalias 3 ,
+(see
+.Xr libalias 3 ) ,
 resulting in the ability (in
 .Fl auto
 mode) to properly connect the process that caused the PPP link to
@@ -3169,7 +3177,8 @@ is replaced with the interface destination (peer) address.
 If the
 .Ar add!\&
 command is used
-.Pq note the trailing Dq !\& ,
+(note the trailing
+.Dq !\& ) ,
 then if the route already exists, it will be updated as with the
 .Sq route change
 command (see
@@ -3360,7 +3369,7 @@ is specified, only data coming from that IP number is redirected.
 .Ar remotePort
 must either be
 .Dq 0
-.Pq indicating any source port
+(indicating any source port)
 or a range of ports the same size as the other ranges.
 .Pp
 This option is useful if you wish to run things like Internet phone on
@@ -3373,7 +3382,8 @@ This command tells
 .Nm
 to redirect packets of protocol type
 .Ar proto
-.Pq see Xr protocols 5
+(see
+.Xr protocols 5 )
 to the internall address
 .Ar localIP .
 .Pp
@@ -3555,7 +3565,7 @@ is specified, the LCP layer is brought down, but
 will not bring the link offline.
 It is subsequently possible to use
 .Dq term
-.Pq see below
+(see below)
 to talk to the peer machine if, for example, something like
 .Dq slirp
 is being used.
@@ -3598,7 +3608,8 @@ the default route is deleted.
 If the
 .Ar delete!\&
 command is used
-.Pq note the trailing Dq !\& ,
+(note the trailing
+.Dq !\& ) ,
 .Nm
 will not complain if the route does not already exist.
 .It dial|call Op Ar label Ns Xo
@@ -3669,7 +3680,8 @@ Instead of specifying
 .Ar mask ,
 .Ar /bits
 can be used
-.Pq with no space between \&it and Ar addr .
+(with no space between it and
+.Ar addr ) .
 If the given address already exists, the command fails unless the
 .Dq !\&
 is used - in which case the previous interface address entry is overwritten
@@ -4006,7 +4018,8 @@ values.
 If the
 .Dq !\&
 is doubled up
-.Pq to Dq !! ,
+(to
+.Dq !! ) ,
 it is treated as a single literal
 .Dq !\& ,
 otherwise, ignoring the
@@ -4064,7 +4077,8 @@ These settings apply only in multi-link mode and default to zero, zero and
 five respectively.
 When more than one
 .Ar demand-dial
-.Pq also known as Fl auto
+(also known as
+.Fl auto )
 mode link is available, only the first link is made active when
 .Nm
 first reads data from the tun device.
@@ -4825,7 +4839,8 @@ Note that the
 argument may be overridden by the third field in the
 .Pa ppp.secret
 file once the client has authenticated itself
-.Pq if PAP or CHAP are Dq enabled .
+(if PAP or CHAP are
+.Dq enabled ) .
 Refer to the
 .Sx AUTHENTICATING INCOMING CONNECTIONS
 section for details.
@@ -5531,7 +5546,8 @@ Show the current HDLC statistics.
 Give a summary of available show commands.
 .It show iface
 Show the current interface information
-.Pq the same \&as Dq iface show .
+(the same as
+.Dq iface show ) .
 .It show ipcp
 Show the current IPCP statistics.
 .It show layers
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index f6d168e..29e7681 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -179,7 +179,8 @@ interactive prompt.
 .El
 .Pp
 One or more configuration entries or systems
-.Pq as specified in Pa /etc/ppp/ppp.conf
+(as specified in
+.Pa /etc/ppp/ppp.conf )
 may also be specified on the command line.
 .Nm
 will read the
@@ -506,7 +507,8 @@ Although not strictly relevant to
 .Nm Ns No 's
 operation, you should configure your resolver so that it works correctly.
 This can be done by configuring a local DNS
-.Pq using Xr named 8
+(using
+.Xr named 8 )
 or by adding the correct
 .Sq nameserver
 lines to the file
@@ -584,7 +586,8 @@ is) use much more reliable checking mechanisms.
 Parity has a relatively
 huge overhead (a 12.5% increase in traffic) and as a result, it is always
 disabled
-.Pq set to Dq none
+(set to
+.Dq none )
 when
 .Dv PPP
 is opened.
@@ -963,7 +966,8 @@ configuration by using the
 .Dq set server
 command in
 .Pa /etc/ppp/ppp.conf ,
-.Pq for example, Dq set server +3000 mypasswd
+(for example,
+.Dq Li "set server +3000 mypasswd" )
 and connecting to the diagnostic port as follows:
 .Bd -literal -offset indent
 # pppctl 3000	(assuming tun0)
@@ -1289,7 +1293,7 @@ Add either
 .Dq enable chap
 or
 .Dq enable pap
-.Pq or both
+(or both)
 to
 .Pa /etc/ppp/ppp.conf
 under the
@@ -1365,7 +1369,7 @@ authentication fails.
 .Pp
 If authentication is successful,
 .Ar hisaddr
-.Pq if specified
+(if specified)
 is used when negotiating IP numbers.
 See the
 .Dq set ifaddr
@@ -1551,7 +1555,8 @@ data does not have to be rearranged into packets.
 Care should be taken when adding a default route through a tunneled
 setup like this.
 It is quite common for the default route
-.Pq added in Pa /etc/ppp/ppp.linkup
+(added in
+.Pa /etc/ppp/ppp.linkup )
 to end up routing the link's TCP connection through the tunnel,
 effectively garrotting the connection.
 To avoid this, make sure you add a static route for the benefit of
@@ -1820,7 +1825,7 @@ ppp ON awfulhak> set timeout 600
 .Pp
 The timeout period is measured in seconds, the default value for which
 is 180 seconds
-.Pq or 3 min .
+(or 3 min).
 To disable the idle timer function, use the command
 .Bd -literal -offset indent
 ppp ON awfulhak> set timeout 0
@@ -1847,7 +1852,7 @@ By default,
 .Nm
 will attempt to use (or be willing to accept) both compression protocols
 when the peer agrees
-.Pq or requests them .
+(or requests them).
 The deflate protocol is preferred by
 .Nm .
 Refer to the
@@ -1861,7 +1866,7 @@ by using only one of
 .Dq disable deflate
 and
 .Dq deny deflate
-.Pq assuming that the peer supports both algorithms .
+(assuming that the peer supports both algorithms).
 .Pp
 By default, when negotiating DEFLATE,
 .Nm
@@ -2206,7 +2211,7 @@ to
 This tells
 .Nm
 to add a default route to whatever the peer address is
-.Pq 10.0.0.2 in this example .
+(10.0.0.2 in this example).
 This route is
 .Sq sticky ,
 meaning that should the value of
@@ -2436,7 +2441,8 @@ and
 commands.
 The
 .Sq authname
-.Pq and Sq authkey
+(and
+.Sq authkey )
 must be agreed in advance with the peer.
 .Pp
 Multi-link capabilities are enabled using the
@@ -2449,7 +2455,8 @@ will attempt to negotiate a multi-link connection with the peer.
 By default, only one
 .Sq link
 is available
-.Pq called Sq deflink .
+(called
+.Sq deflink ) .
 To create more links, the
 .Dq clone
 command is used.
@@ -2885,7 +2892,7 @@ Default: Enabled and Accepted.
 This option determines if
 .Nm
 will request and accept requests for short
-.Pq 12 bit
+(12 bit)
 sequence numbers when negotiating multi-link mode.
 This is only applicable if our MRRU is set (thus enabling multi-link).
 .It vjcomp
@@ -3113,7 +3120,8 @@ The option can only be enabled if network address translation is enabled
 With this option enabled,
 .Nm
 will pass traffic for old interface addresses through the NAT engine
-.Pq see Xr libalias 3 ,
+(see
+.Xr libalias 3 ) ,
 resulting in the ability (in
 .Fl auto
 mode) to properly connect the process that caused the PPP link to
@@ -3169,7 +3177,8 @@ is replaced with the interface destination (peer) address.
 If the
 .Ar add!\&
 command is used
-.Pq note the trailing Dq !\& ,
+(note the trailing
+.Dq !\& ) ,
 then if the route already exists, it will be updated as with the
 .Sq route change
 command (see
@@ -3360,7 +3369,7 @@ is specified, only data coming from that IP number is redirected.
 .Ar remotePort
 must either be
 .Dq 0
-.Pq indicating any source port
+(indicating any source port)
 or a range of ports the same size as the other ranges.
 .Pp
 This option is useful if you wish to run things like Internet phone on
@@ -3373,7 +3382,8 @@ This command tells
 .Nm
 to redirect packets of protocol type
 .Ar proto
-.Pq see Xr protocols 5
+(see
+.Xr protocols 5 )
 to the internall address
 .Ar localIP .
 .Pp
@@ -3555,7 +3565,7 @@ is specified, the LCP layer is brought down, but
 will not bring the link offline.
 It is subsequently possible to use
 .Dq term
-.Pq see below
+(see below)
 to talk to the peer machine if, for example, something like
 .Dq slirp
 is being used.
@@ -3598,7 +3608,8 @@ the default route is deleted.
 If the
 .Ar delete!\&
 command is used
-.Pq note the trailing Dq !\& ,
+(note the trailing
+.Dq !\& ) ,
 .Nm
 will not complain if the route does not already exist.
 .It dial|call Op Ar label Ns Xo
@@ -3669,7 +3680,8 @@ Instead of specifying
 .Ar mask ,
 .Ar /bits
 can be used
-.Pq with no space between \&it and Ar addr .
+(with no space between it and
+.Ar addr ) .
 If the given address already exists, the command fails unless the
 .Dq !\&
 is used - in which case the previous interface address entry is overwritten
@@ -4006,7 +4018,8 @@ values.
 If the
 .Dq !\&
 is doubled up
-.Pq to Dq !! ,
+(to
+.Dq !! ) ,
 it is treated as a single literal
 .Dq !\& ,
 otherwise, ignoring the
@@ -4064,7 +4077,8 @@ These settings apply only in multi-link mode and default to zero, zero and
 five respectively.
 When more than one
 .Ar demand-dial
-.Pq also known as Fl auto
+(also known as
+.Fl auto )
 mode link is available, only the first link is made active when
 .Nm
 first reads data from the tun device.
@@ -4825,7 +4839,8 @@ Note that the
 argument may be overridden by the third field in the
 .Pa ppp.secret
 file once the client has authenticated itself
-.Pq if PAP or CHAP are Dq enabled .
+(if PAP or CHAP are
+.Dq enabled ) .
 Refer to the
 .Sx AUTHENTICATING INCOMING CONNECTIONS
 section for details.
@@ -5531,7 +5546,8 @@ Show the current HDLC statistics.
 Give a summary of available show commands.
 .It show iface
 Show the current interface information
-.Pq the same \&as Dq iface show .
+(the same as
+.Dq iface show ) .
 .It show ipcp
 Show the current IPCP statistics.
 .It show layers
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 7da9b53..b24e84e 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -90,14 +90,14 @@ Enables output of debugging message.
 This option also instructs
 .Nm
 to run in foreground mode
-.Pq does not become daemon .
+(does not become daemon).
 .\"
 .It Fl D
 Enables extensive output of debugging message.
 This option also instructs
 .Nm
 to run in foreground mode
-.Pq does not become daemon .
+(does not become daemon).
 .\"
 .It Fl h
 Disables the split horizon processing.
@@ -107,7 +107,7 @@ By default,
 .Nm
 will not exchange site local routes for safety reasons.
 This is because semantics of site local address space is rather vague
-.Pq specification is still in being worked ,
+(specification is still in being worked),
 and there is no good way to define site local boundary.
 With
 .Fl l
@@ -232,11 +232,9 @@ for communicating with peers using link-local addresses.
 Internally
 .Nm
 embeds interface identifier into bit 32 to 63 of link-local addresses
-.Po
-.Li fe80::xx
+.Li ( fe80::xx
 and
-.Li ff02::xx
-.Pc
+.Li ff02::xx )
 so they will be visible on internal state dump file
 .Pq Pa /var/run/route6d_dump .
 .Pp
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index 81102ad..5dc71cf 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -144,7 +144,7 @@ In this case,
 .Nm
 will transmit router advertisement with router lifetime 0
 to all the interfaces
-.Pq in accordance with RFC2461 6.2.5 .
+(in accordance with RFC2461 6.2.5).
 .Sh RETURN VALUES
 The
 .Nm
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 29f75ca..cd5fc24 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -80,14 +80,14 @@ will use the default values.
 .It Cm \&maxinterval
 (num) The maximum time allowed between sending unsolicited
 multicast router advertisements
-.Pq unit: seconds .
+(unit: seconds).
 The default value is 600.
 Its value must be no less than 4 seconds
 and no greater than 1800 seconds.
 .It Cm \&mininterval
 (num) The minimum time allowed between sending unsolicited multicast
 router advertisements
-.Pq unit: seconds .
+(unit: seconds).
 The default value is the one third of value of
 .Cm maxinterval .
 Its value must be no less than 3 seconds and no greater than .75 *
@@ -107,29 +107,21 @@ The default value is 64.
 .It Cm \&raflags
 (num) Flags field in router advertisement message header.
 Bit 7
-.Po
-.Li 0x80
-.Pc
+.Pq Li 0x80
 means Managed address configuration flag bit,
 and Bit 6
-.Po
-.Li 0x40
-.Pc
+.Pq Li 0x40
 means Other stateful configuration flag bit.
 Bit 4
-.Po
-.Li 0x10
-.Pc
+.Pq Li 0x10
 and Bit 3
-.Po
-.Li 0x08
-.Pc
+.Pq Li 0x08
 are used to encode router preference.
 0x01 means high, 0x00 means medium, and 0x11 means low.
 The default value is 0.
 .It Cm \&rltime
 (num) Router lifetime field
-.Pq unit: seconds .
+(unit: seconds).
 Its value must be no greater than 3600000.
 When
 .Nm rtadvd
@@ -139,11 +131,11 @@ advertising interfaces as described in
 The default value is 1800.
 .It Cm \&rtime
 (num) Reachable time field
-.Pq unit: milliseconds .
+(unit: milliseconds).
 The default value is 0, which means unspecified by this router.
 .It Cm \&retrans
 (num) Retrans Timer field
-.Pq unit: milliseconds .
+(unit: milliseconds).
 The default value is 0, which means unspecified by this router.
 .El
 .Pp
@@ -157,7 +149,7 @@ and advertise the prefixes with the default parameters.
 .It Cm \&clockskew
 (num) Time skew to adjust link propagation delays and clock skews
 betwen routers on the link
-.Pq unit: seconds .
+(unit: seconds).
 This value is used in consistency check for locally-configured and
 advertised prefix lifetimes, and has its meaning when the local router
 configures a prefix on the link with a lifetime that decrements in
@@ -187,14 +179,10 @@ The default value is 64.
 .It Cm \&pinfoflags
 (num) Flags field in prefix information option.
 Bit 7
-.Po
-.Li 0x80
-.Pc
+.Pq Li 0x80
 means On-link flag bit,
 and Bit 6
-.Po
-.Li 0x40
-.Pc
+.Pq Li 0x40
 means Autonomous address-configuration flag bit.
 The default value is 0xc0, i.e., both bits are set.
 .It Cm \&addr
@@ -211,14 +199,14 @@ omitted if the value of
 is more than 0.
 .It Cm \&vltime
 (num) Valid lifetime field
-.Pq unit: seconds .
+(unit: seconds).
 The default value is 2592000 (30 days).
 .It Cm \&vltimedecr
 (bool) This item means the advertised valid lifetime will decrements
 in real time, which is disabled by default.
 .It Cm \&pltime
 (num) Preferred lifetime field
-.Pq unit: seconds .
+(unit: seconds).
 The default value is 604800 (7 days).
 .It Cm \&pltimedecr
 (bool) This item means the advertised preferred lifetime will decrements
@@ -249,11 +237,9 @@ will use the default value.
 .Bl -tag -width indent
 .It Cm \&nolladdr
 (bool) By default
-.Po
-if
+(if
 .Cm \&nolladdr
-is not specified
-.Pc ,
+is not specified),
 .Xr rtadvd 8
 will try to get link-layer address for the interface from the kernel,
 and attach that in source link-layer address option.
@@ -305,14 +291,10 @@ The default value is 64.
 .It Cm \&rtrflags
 (num) Flags field in route information option.
 Bit 4
-.Po
-.Li 0x10
-.Pc
+.Pq Li 0x10
 and
 and Bit 3
-.Po
-.Li 0x08
-.Pc
+.Pq Li 0x08
 are used to encode router preference for the route.
 The default value is 0x00, i.e. medium router preference.
 .It Cm \&rtrprefix
@@ -329,7 +311,7 @@ omitted if the value of
 is more than 0.
 .It Cm \&rtrltime
 (num) route lifetime field in route information option.
-.Pq unit: seconds .
+(unit: seconds).
 The default value is 2592000 (30 days). (not specified in draft-draves-router-selection-01.txt now)
 .El
 You can also refer one line from another by using
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index 1cf369e..ed8247d 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -63,7 +63,7 @@ and to get non link-local addresses.
 .Pp
 .Nm
 should be used on IPv6 hosts
-.Pq non-router nodes
+(non-router nodes)
 only.
 .Pp
 If you invoke the program as
diff --git a/usr.sbin/setkey/setkey.8 b/usr.sbin/setkey/setkey.8
index 0fedfe7..b7d6c07 100644
--- a/usr.sbin/setkey/setkey.8
+++ b/usr.sbin/setkey/setkey.8
@@ -61,16 +61,12 @@ as well as Security Policy Database (SPD) entries in the kernel.
 .Pp
 .Nm
 takes a series of operations from the standard input
-.Po
-if invoked with
-.Fl c
-.Pc
+(if invoked with
+.Fl c )
 or the file named
 .Ar filename
-.Po
-if invoked with
-.Fl f Ar filename
-.Pc .
+(if invoked with
+.Fl f Ar filename ) .
 .Bl -tag -width Ds
 .It Fl D
 Dump the SAD entries.
@@ -228,11 +224,9 @@ IPCOMP
 Security Parameter Index (SPI) for the SAD and the SPD.
 It must be decimal number or hexadecimal number
 You can not use the set of SPI values in the range 0 through 255.
-.Po
-with
+(with
 .Li 0x
-attached
-.Pc .
+attached).
 .\"
 .Pp
 .It Ar extensions
@@ -302,7 +296,7 @@ If
 is not specified with
 .Li ipcomp
 line, the kernel will use well-known IPComp CPI
-.Pq compression parameter index
+(compression parameter index)
 on IPComp CPI field on packets, and
 .Ar spi
 field will be ignored.
@@ -403,7 +397,7 @@ NOTE:
 .Ar upperspec
 does not work against forwarding case at this moment,
 as it requires extra reassembly at forwarding node
-.Pq not implemented at this moment .
+(not implemented at this moment).
 We have many protocols in
 .Pa /etc/protocols ,
 but protocols except of TCP, UDP and ICMP may not be suitable to use with IPSec.
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 20f9d38..879e34e 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -76,10 +76,8 @@ Debug mode.
 Specify how many hops to skip in trace.
 .It Fl g Ar gateway
 Specify intermediate gateway
-.Po
-.Nm
-uses routing header
-.Pc .
+.Nm (
+uses routing header).
 .It Fl m Ar hoplimit
 Specify maximum hoplimit.
 .It Fl l
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index bb28131..6d36891 100644
--- a/usr.sbin/tzsetup/tzsetup.8
+++ b/usr.sbin/tzsetup/tzsetup.8
@@ -61,7 +61,9 @@ The contents of the timezone database are indexed by
 This file lists, for each timezone data file, the
 .Tn ISO
 3166 territory code, approximate geographical coordinates
-.Pq in Tn ISO No 6709 format ,
+(in
+.Tn ISO
+6709 format),
 and location within the territory.
 .Pp
 The maintainers of the database maintain the following policies:
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index 949a45f..3d53cd6 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -233,12 +233,14 @@ option.
 The VESA BIOS support must be linked to the kernel
 or loaded as a KLD module if you wish to use VESA video modes
 or 132 column modes
-.Pq see Xr vga 4 .
+(see
+.Xr vga 4 ) .
 .Pp
 You need to compile your kernel with the
 .Ar VGA_WIDTH90
 option if you wish to use VGA 90 column modes
-.Pq see Xr vga 4 .
+(see
+.Xr vga 4 ) .
 .Pp
 Video modes other than 25 and 30 line modes may require specific size of font.
 Use