26 files changed, 53 insertions, 50 deletions

diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 0b287e139ea5..5dc298dce9f7 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -127,6 +127,6 @@ command can be used:
 .Xr sysctl 8
 .Sh HISTORY
 A
-.Nm core
+.Nm
 file format appeared in
 .At v6 .
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 734450874c58..69500c4aa004 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -48,7 +48,7 @@
 devfs	/devs	devfs rw 0 0
 .Sh DESCRIPTION
 The device file system, or
-.Nm devfs ,
+.Nm ,
 provides access to kernel's device 
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 4423b0f487dc..1be240c5074c 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -53,7 +53,7 @@ The format is patterned
 after the
 .Xr termcap 5
 terminal data base.  Entries in 
-.Nm disktab
+.Nm
 consist of a number of `:' separated fields.  The
 first entry for each disk gives the names which are
 known for the disk, separated by `|' characters.  The
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index 54e104d5ad3a..aaa665d5ae9c 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -38,7 +38,7 @@
 .Nd ethernet address database
 .Sh DESCRIPTION
 The
-.Nm ethers
+.Nm
 database contains information regarding known 48-bit ethernet addresses
 of hosts on an Internetwork.
 The data is stored in a file called
@@ -90,7 +90,7 @@ structure, and a hostname stored as a character string.
 .Bl -tag -width /etc/services -compact
 .It Pa /etc/ethers
 The
-.Nm ethers
+.Nm
 file resides in
 .Pa /etc .
 .El
@@ -99,5 +99,5 @@ file resides in
 .Xr yp 4
 .Sh HISTORY
 The
-.Nm ethers
+.Nm
 format is based on the format used in SunOS 4.1.x.
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index 7abacb9d4bdb..e01f2f0815fd 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -9,7 +9,7 @@
 .Nd change device protection upon login
 .Sh DESCRIPTION
 The
-.Nm fbtab
+.Nm
 file contains a number of lines specifying a device together with a list
 of devices with associated protections. 
 Comments start with a # and extend to the end of the line.
@@ -33,7 +33,7 @@ and gid arguments.
 .Bl -tag -width /etc/fbtab -compact
 .It Pa /etc/fbtab
 The
-.Nm fbtab
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/fdesc.5 b/share/man/man5/fdesc.5
index 7e9ff0dc06d7..2af50dd90053 100644
--- a/share/man/man5/fdesc.5
+++ b/share/man/man5/fdesc.5
@@ -48,7 +48,7 @@
 fdesc	/dev/fd	fdesc rw 0 0
 .Sh DESCRIPTION
 The file-descriptor file system, or
-.Nm fdesc ,
+.Nm ,
 provides access to the per-process file descriptor
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 7e9ff0dc06d7..2af50dd90053 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -48,7 +48,7 @@
 fdesc	/dev/fd	fdesc rw 0 0
 .Sh DESCRIPTION
 The file-descriptor file system, or
-.Nm fdesc ,
+.Nm ,
 provides access to the per-process file descriptor
 namespace in the global filesystem namespace.
 The conventional mount point is
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 162777151bdd..2b490aa9d3b5 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -42,24 +42,24 @@
 .Fd #include <fstab.h>
 .Sh DESCRIPTION
 The file
-.Nm fstab
+.Nm
 contains descriptive information about the various file
 systems.
-.Nm fstab
+.Nm
 is only read by programs, and not written;
 it is the duty of the system administrator to properly create 
 and maintain this file.
 Each filesystem is described on a separate line;
 fields on each line are separated by tabs or spaces.
 The order of records in
-.Nm fstab
+.Nm
 is important because
 .Xr fsck 8 ,
 .Xr mount 8 ,
 and
 .Xr umount 8
 sequentially iterate through
-.Nm fstab
+.Nm
 doing their thing.
 .Pp
 The first field,
@@ -240,7 +240,7 @@ and
 .Bl -tag -width /etc/fstab -compact
 .It Pa /etc/fstab
 The file
-.Nm fstab
+.Nm
 resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index c9023a436129..44e2849a1696 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -151,7 +151,7 @@ may still have this limits.
 The
 .Xr passwd 1
 command does not change the
-.Nm group
+.Nm
 passwords.
 .Sh HISTORY
 A
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 3708958d4dae..058e8c431366 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -40,7 +40,7 @@
 .Nd host name data base
 .Sh DESCRIPTION
 The
-.Nm hosts
+.Nm
 file contains information regarding
 the known hosts on the network.
 It can be used in conjunction with DNS, and the NIS
@@ -95,7 +95,7 @@ or comment character.
 .Bl -tag -width /etc/hosts -compact
 .It Pa /etc/hosts
 The
-.Nm hosts
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index 90ab7b74df80..5a84d8a92264 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -40,7 +40,7 @@
 .Nd trusted remote host name and user data base
 .Sh DESCRIPTION
 The
-.Nm hosts.equiv
+.Nm
 and
 .Nm .rhosts
 files contain information regarding
@@ -119,7 +119,7 @@ except users from netgroup
 .Bl -tag -width /etc/hosts.equivxxx -compact
 .It Pa /etc/hosts.equiv
 The
-.Nm hosts.equiv
+.Nm
 file resides in
 .Pa /etc .
 .It Pa $HOME/.rhosts
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index d252d604c67e..e5041fa91b91 100644
--- a/share/man/man5/hosts.lpd.5
+++ b/share/man/man5/hosts.lpd.5
@@ -39,7 +39,7 @@
 .Nd trusted hosts that may use local print services
 .Sh DESCRIPTION
 The
-.Nm hosts.lpd
+.Nm
 file contains a list of hostnames or IP addresses
 that are allowed to use your local print services.
 List every hostname or IP address on a line itself.
@@ -47,7 +47,7 @@ List every hostname or IP address on a line itself.
 .Bl -tag -width /etc/hosts.lpdxxxxx -compact
 .It Pa /etc/hosts.lpd
 The
-.Nm hosts.lpd
+.Nm
 file resides in
 .Pa /etc .
 .Sh SEE ALSO
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index a50030653ba6..87ed18b4e3df 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -50,6 +50,6 @@ location of most system configuration files
 .El
 .Sh HISTORY
 The
-.Nm intro
+.Nm
 section manual page appeared in
 .Fx 2.2 .
diff --git a/share/man/man5/kernfs.5 b/share/man/man5/kernfs.5
index 1976f134c3bc..b4244d619d17 100644
--- a/share/man/man5/kernfs.5
+++ b/share/man/man5/kernfs.5
@@ -42,7 +42,7 @@ kern		/kern	kernfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The kernel file system, or
-.Nm kernfs ,
+.Nm ,
 provides access to information on the currently running kernel.
 It is normally mounted on
 .Pa /kern .
@@ -105,7 +105,7 @@ is also available from
 .Bl -tag -width /kern/XXXXXXX
 .It Pa /kern
 normal mount point for the
-.Nm kernfs .
+.Nm .
 .El
 .Sh SEE ALSO
 .Xr sysctl 3 ,
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index 065393456507..4f2df6814439 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -14,7 +14,7 @@ linproc		/compat/linux/proc	linprocfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The Linux process file system, or
-.Nm linprocfs ,
+.Nm ,
 emulates a subset of Linux' process file system and is required for
 the complete operation of some Linux binaries.
 .Pp
@@ -52,7 +52,7 @@ group.
 .Bl -tag -width /compat/linux/proc/self/XXXXXXX -compact
 .It Pa /compat/linux/proc
 normal mount point for the
-.Nm linprocfs .
+.Nm .
 .It Pa /compat/linux/proc/cpuinfo
 CPU vendor and model information in human-readable form.
 .It Pa /compat/linux/proc/meminfo
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 6bd1285af173..cb91b411aa09 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -40,7 +40,7 @@
 .Nd network name data base
 .Sh DESCRIPTION
 The
-.Nm networks
+.Nm
 file contains information regarding
 the known networks which comprise the
 .Tn DARPA
@@ -74,7 +74,7 @@ delimiter, newline, or comment character.
 .Bl -tag -width /etc/networks -compact
 .It Pa /etc/networks
 The
-.Nm networks
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index ca281c801383..7734707add9c 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -50,7 +50,7 @@ containing information regarding hosts, users (passwords), groups, etc.
 Each database comes from a source (such as local files, DNS, and
 .Tn NIS ) ,
 and the order to look up the sources is specified in
-.Nm nsswitch.conf .
+.Nm .
 .Pp
 Each entry in 
 .Nm
@@ -199,7 +199,7 @@ To ensure compatibility with previous and current implementations, the
 source must appear alone for a given database.
 .Ss Default source lists
 If, for any reason,
-.Nm nsswitch.conf
+.Nm
 doesn't exist, or it has missing or corrupt entries,
 .Xr nsdispatch 3
 will default to an entry of
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 671d42bccfc6..7b49790e461e 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -44,7 +44,7 @@
 .Nd format of the password file
 .Sh DESCRIPTION
 The
-.Nm passwd
+.Nm
 files are the local source of password information.
 They can be used in conjunction with the Hesiod domains
 .Sq passwd 
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index aefa23352672..0c9fafe11a1c 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -33,7 +33,7 @@
 .Nd periodic job configuration information.
 .Sh DESCRIPTION
 The file
-.Nm periodic.conf
+.Nm
 contains a description of how daily, weekly and montly system maintenance
 jobs should run.
 It resides in the
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 06812b16fc0e..62141aa18fb0 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -14,7 +14,7 @@ proc		/proc	procfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The process file system, or
-.Nm procfs ,
+.Nm ,
 implements a view of the system process table inside the file system.
 It is normally mounted on
 .Pa /proc ,
@@ -202,7 +202,7 @@ group.
 .Bl -tag -width /proc/curproc/XXXXXXX -compact
 .It Pa /proc
 normal mount point for the
-.Nm procfs .
+.Nm .
 .It Pa /proc/pid
 directory containing process information for process 
 .Pa pid .
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 4756025f4e24..4ffab0f649e8 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -40,7 +40,7 @@
 .Nd protocol name data base
 .Sh DESCRIPTION
 The
-.Nm protocols
+.Nm
 file contains information regarding the known protocols used in the
 .Tn DARPA
 Internet.  For each protocol a single line should be present
@@ -63,7 +63,7 @@ or comment character.
 .Bl -tag -width /etc/protocols -compact
 .It Pa /etc/protocols
 The
-.Nm protocols
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 0f89a7c9f5ed..261687f4f8f4 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -186,7 +186,7 @@ arpavax|ax:\e
 .Bl -tag -width /etc/remote -compact
 .It Pa /etc/remote
 The
-.Nm remote
+.Nm
 host description file
 resides in
 .Pa /etc .
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index e0d9e2c12fca..a4a31b3529a5 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -40,7 +40,7 @@
 .Nd service name data base
 .Sh DESCRIPTION
 The
-.Nm services
+.Nm
 file contains information regarding
 the known services available in the
 Internet.
@@ -78,7 +78,7 @@ at the location where the ``+'' appears.
 .Bl -tag -width /etc/services -compact
 .It Pa /etc/services
 The
-.Nm services
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 70626ad3ef5b..d01cdce5b33b 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -40,7 +40,7 @@
 .Nd shell database
 .Sh DESCRIPTION
 The
-.Nm shells
+.Nm
 file contains a list of the shells on the system.
 For each shell a single line should be present, consisting of the
 shell's path, relative to root.
@@ -53,7 +53,7 @@ Blank lines are also ignored.
 .Bl -tag -width /etc/shells -compact
 .It Pa /etc/shells
 The
-.Nm shells
+.Nm
 file resides in
 .Pa /etc .
 .El
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 29d283688f32..b3f9e99187f6 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -217,6 +217,6 @@ compiled files:
 More basic types are needed.
 .Sh HISTORY
 The
-.Nm stab
+.Nm
 file appeared in
 .Bx 4.0 .
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 8a9c4b7bad09..ca0d4fd59081 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -48,7 +48,7 @@ The file
 .Aq Pa utmp.h
 declares the structures used to record information about current
 users in the file
-.Nm utmp ,
+.Nm ,
 logins and logouts in the file
 .Nm wtmp ,
 and last logins in the file
@@ -110,14 +110,14 @@ record is written,
 .\" .Xr libutil 3
 .\" routine
 the file
-.Nm utmp
+.Nm
 is opened and the
 .Fa utmp
 record for the user inserted.
 This record remains there until
 the user logs out at which time it is deleted.
 The
-.Nm utmp
+.Nm
 file is used by the programs
 .Xr rwho 1 ,
 .Xr users 1 ,
@@ -188,13 +188,16 @@ indicates the new time.
 .Bl -tag -width /var/log/lastlog -compact
 .It Pa /var/run/utmp
 The
-.Nm utmp file.
+.Nm
+file.
 .It Pa /var/log/wtmp
 The
-.Nm wtmp file.
+.Nm wtmp
+file.
 .It Pa /var/log/lastlog
 The
-.Nm lastlog file.
+.Nm lastlog
+file.
 .El
 .Sh SEE ALSO
 .Xr last 1 ,
@@ -205,7 +208,7 @@ The
 .Xr init 8
 .Sh HISTORY
 A
-.Nm utmp
+.Nm
 and
 .Nm wtmp
 file format appeared in