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.

27 files changed, 196 insertions, 189 deletions

diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index 5c6ca9bf9304..299d6febdc3e 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 a253a21ef3ea..d10e900b7a21 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 f11700a47a87..3de23c852656 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 1bdc5f0a3e50..26f2bf89f6ec 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 a6053e1aaa84..e612a192c8a7 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 9a51d76535e1..160d54a0f937 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 ac4e217602bc..8d7e87903117 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 339f0ea8f313..e5ba6ce39ef7 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 b6f933d3c3ed..53cdaac4657e 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 ec0435453eef..539b1196b3ad 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 5ca214050b59..8ef617f6051a 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 e036ab01821f..44b47cb884fb 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 c81d70f30a51..9c39fb32d9bf 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 5b6642a56981..5ef8063d57d4 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 9ea966037e82..1f96902ab26f 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 8657fd287fdd..ee682588089d 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 3a211a3420cc..657eba26d40f 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 f6d168e03d26..29e768188997 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 f6d168e03d26..29e768188997 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 7da9b53f336e..b24e84e19e1a 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 81102ad01da1..5dc71cf7078f 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 29f75ca56130..cd5fc24bf2db 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 1cf369e48b25..ed8247d13e61 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 0fedfe786229..b7d6c072ecaa 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 20f9d3855743..879e34eaad4f 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 bb2813132fa7..6d368918312f 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 949a45f2794b..3d53cd65b1ae 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