Prepare for mdoc(7)NG.

sys/boot/forth/loader.4th.8

@@ -97,7 +97,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 .
 .Pp

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 *

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

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

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.

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

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

usr.bin/rlogin/rlogin.1

@@ -148,7 +148,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

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

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

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

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

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 ,

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

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

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

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.

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

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

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

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

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

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

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