diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 75c2f290179f..015822f32a66 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -76,12 +76,12 @@ and process this entries only.
 Use
 .Ar name
 instead of
-.Pa whatis Ns .
+.Pa whatis .
 .It Fl o , Fl outfile Ar file
 Write all output to
 .Ar file
 instead of
-.Pa dirname/whatis Ns .
+.Pa dirname/whatis .
 .It Fl v , Fl verbose
 Issue more warnings
 (to stderr).
@@ -97,7 +97,7 @@ for a link.
 .Ic makewhatis $MANPATH
 .Pp
 Create whatis database for all directories in your
-.Pa $MANPATH Ns .
+.Pa $MANPATH .
 .Pp
 .Ic makewhatis -outfile /tmp/mywhatis /usr/local/man $HOME/man
 .Pp
@@ -106,18 +106,18 @@ Create whatis database
 Traverse directories
 .Pa /usr/local/man
 and
-.Pa $HOME/man Ns .
+.Pa $HOME/man .
 Don't create
 .Pa /usr/local/man/whatis
 or
-.Pa $HOME/man/whatis Ns .
+.Pa $HOME/man/whatis .
 .Pp
 .Ic makewhatis -name windex $HOME/man
 .Pp
 Create whatis database
 .Pa windex
 instead of
-.Pa whatis Ns .
+.Pa whatis .
 May be useful for Solaris.
 .Sh FILES
 .Bl -tag -width /etc/master.passwdxx -compact
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index e6ab9a8baf66..7599c7d0c4da 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -125,7 +125,7 @@ or
 For compatibility with older versions of
 .Nm ,
 omitting the numeric parameter (i.e. just
-.Fl d Ns )
+.Fl d )
 will simply increment the debug level by one.
 .It Fl c Ar chdir-path
 Set the current directory used by
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 93bc71bb917e..5b38fccdcfad 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -192,7 +192,7 @@ echo control chars as
 .El
 .Pp
 The following capabilities are no longer supported by
-.Xr getty 8 Ns :
+.Xr getty 8 :
 .Bl -column Name Type /usr/bin/login
 .It "bd	num	0	backspace delay"
 .It "cb	bool	false	use crt backspace mode"
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index b644a7931c93..9d89579e76ba 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -51,7 +51,7 @@ each filesystem specified on the command line by
 This increases the security of NFS-exported filesystems by making
 it difficult to ``guess'' filehandles.
 .Pp
-.Em Note Ns :
+.Em Note :
 .Xr newfs 8
 now does the equivalent of
 .Nm
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 842fb5c6d84d..2d4c13625f72 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -412,7 +412,7 @@ wrapper support enabled, the administrator can configure
 to respond only to selected client machines.
 .Pp
 While these enhancements provide better security than stock
-.Tn NIS Ns ,
+.Tn NIS ,
 they are by no means 100% effective.
 It is still possible for
 someone with access to your network to spoof the server into disclosing
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index b3d211e662a7..c3e6b809a2f6 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -186,10 +186,10 @@ does not exist,
 .Pa _PERM_PATH/at.deny
 is checked, every username not mentioned in it is then allowed
 to use
-.Nm Ns .
+.Nm .
 .Pp
 If neither exists, only the superuser is allowed use of
-.Nm Ns .
+.Nm .
 This is the default configuration.
 .Sh IMPLEMENTATION NOTES
 Note that
diff --git a/usr.sbin/acpi/amldb/amldb.8 b/usr.sbin/acpi/amldb/amldb.8
index ba988f25b3e3..18f478cbc08c 100644
--- a/usr.sbin/acpi/amldb/amldb.8
+++ b/usr.sbin/acpi/amldb/amldb.8
@@ -231,7 +231,7 @@ DSDT data file is read.
 .El
 .Sh EXAMPLES
 The following is an example including, invoking the
-.Nm Ns ,
+.Nm ,
 searching
 .Li _PRS
 (Possible Resource Settings)
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index d2a7448d3f80..c2626367dd71 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -138,7 +138,7 @@ definitions of
 the number of various devices that will be compiled into the system.
 .Pp
 After running
-.Nm Ns ,
+.Nm ,
 it is necessary to run
 .Dq Li make depend
 in the directory where the new makefile
@@ -148,7 +148,7 @@ The
 utility prints a reminder of this when it completes.
 .Pp
 If any other error messages are produced by
-.Nm Ns ,
+.Nm ,
 the problems in the configuration file should be corrected and
 .Nm
 should be run again.
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 1ad7d3af1268..99d8db10f1cc 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -362,7 +362,7 @@ use the
 .Dq nowait
 entry.
 Connection requests for these services are accepted by
-.Nm Ns ,
+.Nm ,
 and the server is given only the newly-accepted socket connected
 to a client of the service.
 Most stream-based services operate in this manner.
diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8
index 04cab067ec28..726f91cc00c4 100644
--- a/usr.sbin/keyserv/keyserv.8
+++ b/usr.sbin/keyserv/keyserv.8
@@ -34,7 +34,7 @@ This is useful during power-fail reboots
 when no one is around to type a password.
 .Pp
 If a client with no secret key calls
-.Nm Ns ,
+.Nm ,
 then the key of user
 .Em nobody
 is used instead as the default key.
@@ -46,7 +46,7 @@ Disable the use of default keys for
 .Em nobody .
 .It Fl D
 Run in debugging mode and log all requests to
-.Nm Ns .
+.Nm .
 .It Fl n
 Root's secret key is not read from
 .Pa /etc/.rootkey .
diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8
index cb9ed7fd74db..c44d564f9e0b 100644
--- a/usr.sbin/pciconf/pciconf.8
+++ b/usr.sbin/pciconf/pciconf.8
@@ -197,7 +197,7 @@ The
 and
 .Fl h
 options are implemented in
-.Nm Ns ,
+.Nm ,
 but not in the underlying
 .Xr ioctl 2 .
 .Pp
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index 4c34273a0b6d..9913c2ba1e48 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -2704,7 +2704,7 @@ Type
 is actually specified as
 .Dq PPP Magna-link Variable Resource Compression
 in
-.Pa rfc1975 Ns !
+.Pa rfc1975 !
 .Nm
 is capable of negotiating with
 .Nm pppd ,
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 88882cfc6b7e..7515728cec7f 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -120,7 +120,7 @@ There are some problems associated with distributing a
 .Fx
 password
 database via
-.Tn NIS Ns :
+.Tn NIS :
 .Fx
 normally only stores encrypted passwords
 in