64 files changed, 95 insertions, 94 deletions

diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index edcf3a4af4c1..c2b5789800c0 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -142,7 +142,7 @@ the permissions on the directory.  Under
 .Fx ,
 the sticky bit is 
 ignored for executable files and may only be set for directories (see 
-.Xr sticky 8 ).
+.Xr sticky 8 ) .
 .It Li 0400
 Allow read by owner.
 .It Li 0200
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index fc13078423a9..30c25a7aac1e 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -1806,7 +1806,7 @@ the complete pathname of the command is printed.
 .Op Ar limit
 .Xc
 Set or display resource limits (see
-.Xr getrlimit 2 ).
+.Xr getrlimit 2 ) .
 If
 .Ar limit
 is specified, the named resource will be set;
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 3e32b7e49690..eb2e463279ab 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -159,7 +159,7 @@ is determined by the
 .Va msg_perm.mode
 field in the same way as is
 done with files (see
-.Xr chmod 2 ),
+.Xr chmod 2 ) ,
 but the effective uid can match either the
 .Va msg_perm.cuid
 field or the
diff --git a/lib/libc/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index 4d282cf4adfd..9dfcca34ce67 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -81,14 +81,14 @@ transmitting data to the system.
 (See the description of IXOFF in the
 .Ql Input Modes
 section of
-.Xr termios 4 ).
+.Xr termios 4 ) .
 .It Fa TCION
 Transmit a START character, which is intended to cause the terminal to start
 transmitting data to the system.
 (See the description of IXOFF in the
 .Ql Input Modes
 section of
-.Xr termios 4 ).
+.Xr termios 4 ) .
 .El
 .Pp
 The
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index c23d4c494863..7039a257f80f 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -69,7 +69,7 @@ for storage of any type of object.
 If the space is at least
 .Em pagesize
 bytes in length (see
-.Xr getpagesize 3 ),
+.Xr getpagesize 3 ) ,
 the returned memory will be page boundary aligned as well.
 If
 .Fn malloc
@@ -207,7 +207,7 @@ option.
 Rather than return failure for any allocation function,
 display a diagnostic message on stderr and cause the program to drop
 core (using
-.Xr abort 3 ).
+.Xr abort 3 ) .
 This option should be set at compile time by including the following in
 the source code:
 .Bd -literal -offset indent
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 8b5e2443c6ba..956168a8ddf4 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -81,7 +81,7 @@ struct timespec {
 .Pp
 Only the super-user may set the time of day.
 If the system securelevel is greater than 1 (see
-.Xr init 8 ),
+.Xr init 8 ) ,
 the time may only be advanced.
 This limitation is imposed to prevent a malicious super-user
 from setting arbitrary time stamps on files.
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index d42772488fba..e6554cc211ce 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -100,7 +100,7 @@ the appropriate part of the year.
 .Pp
 Only the super-user may set the time of day or time zone.
 If the system is running in secure mode (see
-.Xr init 8 ),
+.Xr init 8 ) ,
 the time may only be advanced.
 This limitation is imposed to prevent a malicious super-user
 from setting arbitrary time stamps on files.
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 0c8986f88b33..d594bbce6a72 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -147,7 +147,7 @@ file descriptor may not cause
 .Fn poll
 to return with an error.  In cases where this would have happened in
 the historical implementation (e.g. trying to poll a
-.Xr revoke 2 ed
+.Xr revoke 2 Ns ed
 descriptor), this implementation instead copies the
 .Fa events
 bitmask to the
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index e504929fbb18..88d7a4a3e2de 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -266,7 +266,7 @@ The socket is associated with a connection-oriented protocol
 and has not been connected (see
 .Xr connect 2
 and
-.Xr accept 2 ).
+.Xr accept 2 ) .
 .It Bq Er ENOTSOCK
 The argument
 .Fa s
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 80fb156d12c0..25c0a6f5d215 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -120,7 +120,7 @@ Options include:
 Bind all keys to the standard GNU Emacs-like bindings.
 .It Fl v
 Bind all keys to the standard 
-.Xr vi 1 -like
+.Xr vi 1 Ns -like
 bindings.
 .It Fl a
 List or change key bindings in the 
@@ -223,7 +223,7 @@ causes messages to be verbose.
 List the history.
 .It Ic telltc
 List the values of all the terminal capabilities (see
-.Xr termcap 5 ).
+.Xr termcap 5 ) .
 .It Ic settc Ar cap Ar val
 Set the terminal capability
 .Ar cap
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 780bda700843..61651e328531 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -319,7 +319,7 @@ If the
 .Fa h
 (high) flag is specified, data sockets will be allocated in the high
 port range (see
-.Xr ip 4 ).
+.Xr ip 4 ) .
 .Pp
 If the
 .Fa d
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index fac5f436bf67..b624b3c80ca8 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -137,7 +137,7 @@ Instead, the application obtains the error message
 corresponding to the most recent kvm library call using
 .Fn kvm_geterr
 (see
-.Xr kvm_geterr 3 ).
+.Xr kvm_geterr 3 ) .
 The results are undefined if the most recent kvm call did not produce
 an error.
 Since
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 6712947a63b3..b579bf588422 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -166,7 +166,7 @@ notation may be used.
 .Pp
 These resource limit entries actually specify both the maximum
 and current limits (see
-.Xr getrlimit 2 ).
+.Xr getrlimit 2 ) .
 The current (soft) limit is the one normally used, although the user is permitted
 to increase the current limit to the maximum (hard) limit.
 The maximum and current limits may be specified individually by appending a
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index ff3db33e692a..5650be4f1b80 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -286,7 +286,7 @@ The current date and time in the locale's representation as of the
 .Em \&Lo
 string
 (the \&%+ format of
-.Xr strftime 3 ).
+.Xr strftime 3 ) .
 .It \&%h
 The hostname of the machine, which is normally obtained from the
 system using
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 43404e6ea6ed..b4a5219150d8 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -88,7 +88,7 @@ or
 The remaining fields set flags in the
 .Fa ty_status
 entry (see
-.Xr getttyent 3 ),
+.Xr getttyent 3 ) ,
 specify a window system process that
 .Xr init 8
 will maintain for the terminal line, optionally determine the
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index b87370f5773e..5807a9d37bc2 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -169,7 +169,7 @@ the absolute pathnames of all objects, to standard output.
 When set, these variables are interpreted as format strings a la
 .Xr printf 3
 to customize the trace output and are used by
-.Xr ldd 1 's
+.Xr ldd 1 Ns 's
 .Fl f
 option and allows
 .Xr ldd 1
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index d45712dafdc3..0a0627a80e46 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -104,7 +104,7 @@ the absolute pathnames of all objects, to standard output.
 When set, these variables are interpreted as format strings a la
 .Xr printf 3
 to customize the trace output and are used by
-.Xr ldd 1 's
+.Xr ldd 1 Ns 's
 .Fl f
 option and allows
 .Xr ldd 1
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index d5ce4dfe44a5..cb920cc23c91 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -69,7 +69,7 @@ for requests to connect to the
 port as indicated by the
 .Pa /etc/services
 file (see
-.Xr services 5 ).
+.Xr services 5 ) .
 The
 .Fl debug
 option may be used to start up
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 65030aaed3af..b546a66e73fd 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -76,7 +76,7 @@ the
 .Tn NIS
 slaves, copy new versions of the maps from the master whenever
 any updates are made (i.e. when a user updates their password via
-.Xr yppasswd 1 ).
+.Xr yppasswd 1 ) .
 .Pp
 When run,
 .Nm
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 81e59843b75a..c9b0aa5a9881 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -95,7 +95,7 @@ instead of the default
 Use
 .Ar system
 as the kernel instead of the running kernel (as determined from
-.Xr getbootfile 3 ).
+.Xr getbootfile 3 ) .
 .It Fl u
 Unconfigure a ccd.
 .It Fl U
@@ -140,7 +140,7 @@ The component devices need to name partitions of type
 (or
 .Dq 4.2BSD
 as shown by
-.Xr disklabel 8 ).
+.Xr disklabel 8 ) .
 .Sh EXAMPLES
 .Pp
 A number of ccdconfig examples are shown below.  The arguments passed
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 46489d8c1e67..f64b27697f16 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -62,7 +62,7 @@ The following options are available:
 .Bl -tag -width indent
 .It Fl d
 Enable additional debugging output (which comes primarily from
-.Xr fsck 8 -derived
+.Xr fsck 8 Ns -derived
 code).
 .It Fl f
 Left for historical reasons and has no meaning.
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 04263c331b13..b83769976fb2 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -99,7 +99,7 @@ Export options are specified as follows:
 The credential of the specified user is used for remote access by root.
 The credential includes all the groups to which the user is a member
 on the local machine (see
-.Xr id 1 ).
+.Xr id 1 ) .
 The user may be specified by name or number.
 .Pp
 .Sm off
@@ -209,7 +209,7 @@ The set may be specified in three ways.
 The first way is to list the host name(s) separated by white space.
 (Standard Internet ``dot'' addresses may be used in place of names.)
 The second way is to specify a ``netgroup'' as defined in the netgroup file (see
-.Xr netgroup 5 ).
+.Xr netgroup 5 ) .
 The third way is to specify an Internet subnetwork using a network and
 network mask that is defined as the set of all hosts with addresses within
 the subnetwork.
@@ -233,7 +233,7 @@ and optionally
 .Sm on
 If the mask is not specified, it will default to the mask for that network
 class (A, B or C; see
-.Xr inet 4 ).
+.Xr inet 4 ) .
 .Pp
 For example:
 .Bd -literal -offset indent
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 069ca405f7ab..f4cda8da05d7 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -450,7 +450,7 @@ and
 .Pa /tmp/rstmode*
 are generated with a unique name based on the date of the dump
 and the process ID (see
-.Xr mktemp 3 ),
+.Xr mktemp 3 ) ,
 except for when
 .Fl r
 or
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 847b9f56708a..405c0b320336 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -93,7 +93,7 @@ non-static routes in kernel table.
 Static routes in the kernel table are preserved and
 included in RIP responses if they have a valid RIP metric
 (see
-.Xr route 8 ).
+.Xr route 8 ) .
 .Pp
 If more than one interface is present (not counting the loopback interface),
 it is assumed that the host should forward packets among the
@@ -118,7 +118,7 @@ with a "hop count" metric (a count of 16 or greater is
 considered "infinite").
 Advertised metrics reflect the metric associated with interface
 (see
-.Xr ifconfig 8 ),
+.Xr ifconfig 8 ) ,
 so setting the metric on an interface
 is an effective way to steer traffic.
 .Pp
@@ -186,7 +186,7 @@ support multicasting.
 If no response is received on a remote interface, if there are errors
 while sending responses,
 or if there are more errors than input or output (see
-.Xr netstat 1 ),
+.Xr netstat 1 ) ,
 then the cable or some other part of the interface is assumed to be
 disconnected or broken, and routes are adjusted appropriately.
 .Pp
@@ -461,7 +461,7 @@ or
 is the name of the destination network or host.
 It may be a symbolic network name or an Internet address
 specified in "dot" notation (see
-.Xr inet 3 ).
+.Xr inet 3 ) .
 (If it is a name, then it must either be defined in
 .Pa /etc/networks
 or
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 78429a239bc0..de4ef2e5531e 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -65,12 +65,12 @@ is insufficient disk space.
 Use
 .Ar system
 as the kernel instead of the running kernel (as determined from
-.Xr getbootfile 3 ).
+.Xr getbootfile 3 ) .
 .It Fl v
 Print out some additional debugging information.
 .It Fl z
 Compress the core dump and kernel (see
-.Xr compress 1 ).
+.Xr compress 1 ) .
 .El
 .Pp
 .Nm Savecore
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 17c66517b169..c60d46136b63 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -60,7 +60,7 @@ be combined.  The kernel will only allow component partitions of type
 FS_BSDFFS (type
 .Dq 4.2BSD
 as shown as
-.Xr disklabel 8 ).
+.Xr disklabel 8 ) .
 .Pp
 In order to compile in support for the ccd, you must add a line similar
 to the following to your kernel configuration file:
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 7a023566a8c2..de2955001da1 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -91,7 +91,7 @@ when developing new protocols, or special-purpose applications.
 .Pp
 There are several
 .Tn IPv6-level
-.Xr setsockopt 2 / Ns Xr getsockopt 2
+.Xr setsockopt 2 Ns / Ns Xr getsockopt 2
 options.
 They are separated into the basic IPv6 sockets API
 .Pq defined in RFC2553 ,
@@ -284,7 +284,7 @@ details about the IPv6 header and the IPv6 extension headers on packets.
 The advanced API uses ancillary data for passing data from/to the kernel.
 .Pp
 There are
-.Xr setsockopt 2 / Ns Xr getsockopt 2
+.Xr setsockopt 2 Ns / Ns Xr getsockopt 2
 options to get optional information on incoming packets.
 They are
 .Dv IPV6_PKTINFO ,
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 735e93139378..f710801203a8 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -335,7 +335,7 @@ the job at adapter level.
 A microsequence is an array of opcodes and parameters.
 Each opcode codes an
 operation (opcodes are described in
-.Xr microseq 9 ).
+.Xr microseq 9 ) .
 Standard I/O operations are implemented at ppbus level whereas basic I/O
 operations and microseq language are coded at adapter level for efficiency.
 .Pp
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index 41f892b061c9..26c8fb57dfb0 100644
--- a/share/man/man4/smbus.4
+++ b/share/man/man4/smbus.4
@@ -48,7 +48,7 @@ The
 is a two-wire interface through which simple power-related chips can communicate
 with rest of the system.
 It uses I2C as its backbone (see
-.Xr iicbus 4 ).
+.Xr iicbus 4 ) .
 .Pp
 A system using SMB passes messages to and from devices instead of tripping
 individual control lines.
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index e2f7021685b5..40cbae67f3d2 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -158,7 +158,7 @@ The
 .Dv TCP_NOPUSH
 option is provided to allow servers to easily make use of Transaction
 TCP (see
-.Xr ttcp 4 ).
+.Xr ttcp 4 ) .
 When the option is set to a non-zero value,
 .Tn TCP
 will delay sending any data at all until either the socket is closed,
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 6b763f3fc24c..ed675b18491f 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -51,7 +51,7 @@ When a user logs into
 the system on one of these hardware terminal ports, the system has already
 opened the associated device and prepared the line for normal interactive
 use (see
-.Xr getty 8 .)
+.Xr getty 8 . )
 There is also a special case of a terminal file that connects not to
 a hardware terminal port, but to another program on the other side.
 These special terminal devices are called
@@ -69,7 +69,7 @@ how these lines are opened or used.  Also, these lines are often used
 for dialing out of a system (through an out-calling modem), but again
 the system provides programs that hide the details of accessing
 these terminal special files (see
-.Xr tip 1 ).
+.Xr tip 1 ) .
 .Pp
 When an interactive user logs in, the system prepares the line to
 behave in a certain way (called a
@@ -97,7 +97,7 @@ essentially glues the low level device driver code with the high
 level generic interface routines (such as
 .Xr read 2
 and
-.Xr write 2 ),
+.Xr write 2 ) ,
 and is responsible for implementing the semantics associated
 with the device.  When a terminal file is first opened by a program,
 the default
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index dff481f4d1b9..ea75a9d9c7ed 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -50,7 +50,7 @@ driver has three layers: the controller, the bus, and the
 device layer.
 The controller attaches to a physical bus
 (like
-.Xr pci 4 ).
+.Xr pci 4 ) .
 The
 .Tn USB
 bus attaches to the controller and the root hub attaches
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 64cb8821fd7c..0548ee80647e 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -73,7 +73,7 @@ and without the
 prefix,
 in which case that signal is delivered to the process
 (see
-.Xr sigaction 2 ).
+.Xr sigaction 2 ) .
 .It Pa dbregs
 The debug registers as defined by
 .Dv "struct dbregs"
@@ -188,7 +188,7 @@ file.
 The child process will receive a
 .Dv SIGTRAP
 immediately after the call to exec (see
-.Xr execve 2 ).
+.Xr execve 2 ) .
 .Pp
 Each node is owned by the process's user, and belongs to that user's
 primary group, except for the
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 24941126a350..5e051a841cdd 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -639,7 +639,7 @@ is set to
 and is used for both
 .Xr kerberos 1
 and
-.Xr kadmind 8 ).
+.Xr kadmind 8 ) .
 .It Ar rwhod_enable
 (bool) If set to
 .Ar YES ,
@@ -1381,7 +1381,7 @@ boot time.
 .It Ar rand_irqs
 (str) Set to the list of IRQs to monitor for random number creation
 (see the man page for
-.Xr rndcontrol 8 ).
+.Xr rndcontrol 8 ) .
 .It Ar clear_tmp_enable
 (bool) Set to
 .Ar YES
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index 6de5e9e85899..a4c359c147a6 100644
--- a/share/man/man9/device.9
+++ b/share/man/man9/device.9
@@ -53,14 +53,14 @@ The devices in a system form a tree.
 All devices except
 .Dv root_bus
 have a parent (see
-.Xr device_get_parent 9 ).
+.Xr device_get_parent 9 ) .
 In addition, any device can have children attached to it (see
 .Xr device_add_child 9 ,
 .Xr device_add_child_ordered 9 ,
 .Xr device_find_child 9 ,
 .Xr device_get_children 9 ,
 and
-.Xr device_delete_child 9 ).
+.Xr device_delete_child 9 ) .
 .Pp
 A device which has been successfully been probed and attached to the
 system will also have a driver (see
@@ -70,17 +70,17 @@ and
 and a devclass (see
 .Xr device_get_devclass 9
 and
-.Xr devclass 9 ).
+.Xr devclass 9 ) .
 Various other attributes of the device include a unit number (see
-.Xr device_get_unit 9 ),
+.Xr device_get_unit 9 ) ,
 verbose description (normally supplied by the driver, see
 .Xr device_set_desc 9
 and
-.Xr device_get_desc 9 ),
+.Xr device_get_desc 9 ) ,
 a set of bus-specific variables (see
 .Xr device_get_ivars 9 )
 and a set of driver-specific variables (see
-.Xr device_get_softc 9 ).
+.Xr device_get_softc 9 ) .
 .Pp
 Devices can be in one of several states:
 .Bl -tag -width DS_NOTPRESENT
diff --git a/share/man/man9/device_delete_child.9 b/share/man/man9/device_delete_child.9
index 195c0f82bd83..b9ad6c0c3c1e 100644
--- a/share/man/man9/device_delete_child.9
+++ b/share/man/man9/device_delete_child.9
@@ -47,7 +47,7 @@ and deleted.
 If the device is currently attached, it is first detached (see
 .Xr DEVICE_ATTACH 9
 and
-.Xr DEVICE_DETACH 9 ).
+.Xr DEVICE_DETACH 9 ) .
 .Sh RETURN VALUES
 Zero is returned on success, otherwise an error is returned.
 .Sh SEE ALSO
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index f80e19b2a4c8..518548463917 100644
--- a/share/man/man9/device_get_state.9
+++ b/share/man/man9/device_get_state.9
@@ -59,7 +59,7 @@ which returns
 or
 .Dv DS_BUSY
 (described in
-.Xr device 9 ).
+.Xr device 9 ) .
 To test see if a device was successfully probed, call
 .Xr device_is_alive 9
 which simply returns if the state is greater or equal to
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index cb6c2712c349..0b7d56e7ae63 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -117,13 +117,13 @@ If you get a lock, remember to release the lock (using
 or
 .Xr VOP_UNLOCK 9
 and
-.Xr vrele 9 .)
+.Xr vrele 9 . )
 .It Dv WANTPARENT
 Make
 .Fn namei
 also return the parent (directory) vnode, in unlocked
 state.  Remember to release it (using
-.Xr vrele 9 .)
+.Xr vrele 9 . )
 .It Dv NOCACHE
 Avoid
 .Fn namei
diff --git a/share/man/man9/time.9 b/share/man/man9/time.9
index 6f00ca9c060f..2f3153c247be 100644
--- a/share/man/man9/time.9
+++ b/share/man/man9/time.9
@@ -92,7 +92,7 @@ from
 .Va time
 at boot, and is updated by the periodic timer interrupt.  (It is
 not updated by
-.Xr settimeofday 2 .)
+.Xr settimeofday 2 . )
 .Pp
 All of these variables contain times
 expressed in seconds and microseconds since midnight (0 hour),
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 3742140213dd..0241c0cdf308 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -82,7 +82,7 @@ is command used on the default
 file, and it uses the
 .Pa autoboot
 command (see
-.Xr loader 8 ),
+.Xr loader 8 ) ,
 so it can be stopped for further interaction with
 .Xr loader 8 .
 .It Ic initialize
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 60a020a309e1..1a7ae7a0a2dd 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -79,7 +79,7 @@ All settings have the following format:
 .Pp
 Unless it belongs to one of the classes of settings that receive special
 treatment, a setting will set the value of a
-.Xr loader 8 's
+.Xr loader 8 Ns 's
 environment variable. The settings that receive special
 treatment are listed below. The ones beginning with a
 .Qq *
diff --git a/sys/modules/netgraph/frame_relay/ng_frame_relay.4 b/sys/modules/netgraph/frame_relay/ng_frame_relay.4
index 10bf33345ca9..6e1b1b608d40 100644
--- a/sys/modules/netgraph/frame_relay/ng_frame_relay.4
+++ b/sys/modules/netgraph/frame_relay/ng_frame_relay.4
@@ -49,7 +49,7 @@ The
 node type performs encapsulation, de-encapsulation, and multiplexing
 of packets using the frame relay protocol. It supports up to 1024 DLCI's.
 The LMI protocol is handled by a separate node type (see
-.Xr ng_lmi 4 ).
+.Xr ng_lmi 4 ) .
 .Pp
 The
 .Dv downstream
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 74ea6a9deb50..4834e7a134d9 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -249,7 +249,7 @@ displays an ``ls -l'' style listing of information about the members of
 the archive.
 This listing consists of eight, white-space separated fields:
 the file permissions (see
-.Xr strmode 3 ),
+.Xr strmode 3 ) ,
 the decimal user and group ID's, separated by a single slash (``/''),
 the file size (in bytes), the file modification time (in the
 .Xr date 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index a3653f4ab7e6..2e4ea05bb12b 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -248,7 +248,7 @@ displays an ``ls -l'' style listing of information about the members of
 the archive.
 This listing consists of eight, white-space separated fields:
 the file permissions (see
-.Xr strmode 3 ),
+.Xr strmode 3 ) ,
 the decimal user and group ID's, separated by a single slash (``/''),
 the file size (in bytes), the file modification time (in the
 .Xr date 1
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 7e578090bba7..44338fadb437 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -348,7 +348,7 @@ or if they match the specified flags (if these are preceded by a dash).
 The
 .Ar flags
 are specified using symbolic names (see
-.Xr chflags 1  ).
+.Xr chflags 1 ) .
 Note that this is different from
 .Ic -perm  ,
 which only allows you to specify flags which are set.
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 89ad0ee73c59..1f182c8d5bea 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -783,7 +783,7 @@ Test the value of a variable.
 Test the target being built.
 .It Xo
 .Ic .ifnmake
-.Oo \&! Oc Ar target
+.Oo \&! Oc Ns Ar target
 .Op Ar operator target ...
 .Xc
 Test the target being built.
@@ -791,7 +791,7 @@ Test the target being built.
 Reverse the sense of the last conditional.
 .It Xo
 .Ic .elif
-.Oo \&! Oc Ar expression
+.Oo \&! Oc Ns Ar expression
 .Op Ar operator expression ...
 .Xc
 A combination of
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 2dce797503ae..ec65203ef926 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -124,7 +124,7 @@ Options common to both forms:
 .Bl -tag -width Ic
 .It Fl P Ar rshcmd
 Alternative program to provide
-.Xr rsh 1 -like
+.Xr rsh 1 Ns -like
 transport to the remote server.  It must provide a binary-transparent path
 to the remote server, and must have a command argument syntax that is
 compatible with
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 3737a879b79c..6d06ffc8d4c1 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -144,7 +144,7 @@ Similarly, the line
 will suspend the
 .Nm
 session, and
-.Dq Ao escape char Ac Ao delayed-suspend char Ac
+.Dq Ao escape\ char Ac Ns Ao delayed-suspend\ char Ac
 suspends the
 send portion of the rlogin, but allows output from the remote system.
 By default, the tilde
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 7d0b9a5d7335..e0451391ff99 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -79,7 +79,7 @@ excessively congested, or the
 daemon has terminated on the remote host.
 .It rup: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.  The host may be down.
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index b268c798afe4..d075288dd721 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -87,7 +87,7 @@ excessively congested, or the
 daemon has terminated on the remote host.
 .It Nm Ns : "RPC: Port mapper failure - RPC: Timed out"
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.  The host may be down.
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index e18ebcc7f15f..c22b13a94c64 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -64,7 +64,7 @@ excessively congested, or the
 daemon has terminated on the remote host.
 .It rwall: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accomodate any RPC-based services.  The host may be down.
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index f344f9e88f09..4edae6add359 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -413,7 +413,7 @@ where
 .Dq #
 is a digit, is replaced by the text matched
 by the corresponding backreference expression (see
-.Xr re_format 7 ).
+.Xr re_format 7 ) .
 .Pp
 A line can be split by substituting a newline character into it.
 To specify a newline character in the replacement string, precede it with
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index b560ac11286d..1cc0bf4b62f8 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -77,11 +77,11 @@ the peer, or "(none)" if the socket is neither bound nor connected.
 .It Li LOCAL ADDRESS
 (Internet sockets only)
 The address the local end of the socket is bound to (see
-.Xr getsockname 2 ).
+.Xr getsockname 2 ) .
 .It Li FOREIGN ADDRESS
 (Internet sockets only)
 The address the foreign end of the socket is bound to (see
-.Xr getpeername 2 ).
+.Xr getpeername 2 ) .
 .El
 .Sh SEE ALSO
 .Xr fstat 1 ,
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 2b158b9fea8a..e857d0797a6d 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -407,7 +407,7 @@ Suppress complaints about use of long long integer types.
 At appropriate points, inhibit complaints about unreachable code.
 (This comment is typically placed just after calls to functions
 like
-.Xr exit 3 ).
+.Xr exit 3 ) .
 .It Li /* PRINTFLIKE Ns Ar n Li */
 makes
 .Nm
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index f32f42ab43bf..4e7ca4c81a3e 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -72,7 +72,7 @@ Removes the username from all groups to which it belongs in
 .Pa /etc/group .
 (If a group becomes empty and the group name is the same as the username,
 the group is removed; this complements
-.Xr adduser 8 's
+.Xr adduser 8 Ns 's
 per-user unique groups).
 .El
 .Pp
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index 84d962ff50d5..12f1a966a69a 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -45,7 +45,7 @@ crontabs found are loaded into memory.
 also searches for
 .Pa /etc/crontab
 which is in a different format (see
-.Xr crontab 5 ).
+.Xr crontab 5 ) .
 .Nm Cron
 then wakes up every minute, examining all stored crontabs, checking each
 command to see if it should be run in the current minute.  When executing
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index a948c3284064..89881a7eb0ef 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -82,7 +82,7 @@ one such use could be to write a tar-archive:
 .Dl "tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
 .Pp
 The main difference from using
-.Xr tar 1 's
+.Xr tar 1 Ns 's
 multivolume facility is of course the formatting of the floppies, which
 here is done on the fly,
 thus reducing the amount of work for the floppy-jockey.
diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8
index d4331a6c0198..fdbd17afdea0 100644
--- a/usr.sbin/keyadmin/keyadmin.8
+++ b/usr.sbin/keyadmin/keyadmin.8
@@ -70,7 +70,7 @@ The
 .Nm
 command is used to manually enter security associations into the kernel
 key/security association database.  (See 
-.Xr key 4 ).
+.Xr key 4 ) .
 .Pp
 Almost any operation offered in the
 .Xr key 4
@@ -155,7 +155,7 @@ existing file.  This is to prevent writing into a world-readable file, or a
 named pipe or UNIX socket (see
 .Xr socket 2
 and
-.Xr mkfifo 1 ).
+.Xr mkfifo 1 ) .
 .It Ic help Op command
 .Pp
 Offer brief help without an argument, or slightly more specific help on a
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index a4fe4465137f..a67341fc924a 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -162,7 +162,8 @@ Often
 a site will disable this feature to encourage use of a photocopier
 instead.
 .It Xo
-.Fl Ns Oo Cm 1234 Oc Ar font
+.Fl Ns Op Cm 1234
+.Ar font
 .Xc
 Specifies a
 .Ar font
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index 87e498a4d64e..bfb976b774e9 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -68,7 +68,7 @@ semicolon-separated input/output commands.
 .Pp
 Symbolic register names look like:
 .Pp
-.D1 Ao Em reggroup Ac Aq Em regnumber
+.D1 Ao Em reggroup Ac Ns Aq Em regnumber
 .Pp
 with
 .Aq Em regnumber
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 15f0ea9f83fc..a30ed35de15f 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -240,7 +240,7 @@ final location, otherwise it is extracted into the staging area.
 If the package contains a
 .Ar require
 file (see 
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 then execute it with the following arguments:
 .Bd -filled -offset indent -compact
 .Ar pkg-name
@@ -278,7 +278,7 @@ are given during package creation time (using the
 and 
 .Cm Fl I
 flags to 
-.Xr pkg_create 1 ).
+.Xr pkg_create 1 ) .
 .It
 If
 .Cm @option extract-in-place
@@ -290,7 +290,7 @@ the staging area into their final locations.
 If the package contains an
 .Ar mtreefile
 file (see
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 then mtree is invoked as:
 .Bd -filled -offset indent -compact
 .Cm mtree
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index e50f57e49fa1..080c40338172 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -47,8 +47,8 @@ attacks from miscreants who create dangerous package files.
 .Pp
 You are advised to verify the competence and identity of those who
 provide installable package files.  For extra protection, examine all
-the package control files in the package record directory (
-.Pa /var/db/pkg/<pkg-name>/ ).
+the package control files in the package record directory
+.Pa ( /var/db/pkg/<pkg-name>/ ) .
 Pay particular attention to any +INSTALL, +POST-INSTALL, +DEINSTALL,
 +POST-DEINSTALL, +REQUIRE or +MTREE_DIRS files, and inspect the +CONTENTS
 file for
@@ -116,7 +116,7 @@ option is given).
 If the package contains a
 .Ar require
 file (see 
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 then this is executed first as
 .Bd -filled -offset indent -compact
 .Cm require
@@ -163,7 +163,7 @@ are given during package creation time (using the
 and 
 .Cm Fl K
 flags to 
-.Xr pkg_create 1 ).
+.Xr pkg_create 1 ) .
 .Pp
 If a
 .Cm post-deinstall
@@ -197,7 +197,7 @@ are given during package creation time (using the
 and 
 .Cm Fl K
 flags to 
-.Xr pkg_create 1 ).
+.Xr pkg_create 1 ) .
 .Pp
 Reasoning behind passing keywords such as
 .Ar DEINSTALL
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 7c91dd304988..b68daaaec3f0 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.conf.5
@@ -168,7 +168,7 @@ new home directory is constructed.
 This is
 .Pa /usr/share/skel
 by default.
-.Xr Pw 8 's
+.Xr Pw 8 Ns 's
 .Fl m
 option causes the user's home directory to be created and populated
 using the files contained in the
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index c9c2ec58556a..cf684392da66 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -94,7 +94,7 @@ rules outlined in
 manual page for more information on securenets; the
 .Nm
 server uses the same access control mechanism as
-.Xr ypserv 8 .)
+.Xr ypserv 8 . )
 .Pp
 The server then
 checks the 'old' password supplied by the user to make sure it's