10 files changed, 18 insertions, 17 deletions

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