140 files changed, 486 insertions, 480 deletions

diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 4f3f708a6899..0c4fcf7df5c5 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -42,7 +42,7 @@
 .Nm chflags
 .Nd change file flags
 .Sh SYNOPSIS
-.Nm chflags
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index e80b9443270a..8743a6f3ebe6 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -30,11 +30,11 @@
 .Nm kenv
 .Nd dump the kernel environment
 .Sh SYNOPSIS
-.Nm kenv
+.Nm
 .Op Fl h
 .Op variable
 .Sh DESCRIPTION
-.Nm kenv
+.Nm
 will dump the kernel environment.
 If the
 .Fl h
@@ -45,6 +45,6 @@ will only report that value.
 .Sh SEE ALSO
 .Xr loader 8
 .Sh HISTORY
-.Nm kenv
+.Nm
 appeared in
 .Fx 5.0 .
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 39b827ed8f8e..5332bbd5df78 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -39,13 +39,13 @@
 .Nm apply
 .Nd apply a command to a set of arguments
 .Sh SYNOPSIS
-.Nm apply
+.Nm
 .Op Fl a Ar c
 .Op Fl d
 .Op Fl #
 .Ar command argument ...
 .Sh DESCRIPTION
-.Nm apply
+.Nm
 runs the named
 .Ar command
 on each
@@ -98,7 +98,7 @@ execute them.
 .El
 .Sh ENVIRONMENT
 The following environment variable affects the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width SHELL
 .It Ev SHELL
 Pathname of shell to use.
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 3741299cb8ae..d452f92cf280 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -41,45 +41,45 @@
 .Nm ar
 .Nd create and maintain library archives
 .Sh SYNOPSIS
-.Nm ar
+.Nm
 .Fl d
 .Op Fl \Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl \Tv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl m
 .Op Fl abiTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl p
 .Op Fl \Tv
 .Ar archive [file ...]
-.Nm ar
+.Nm
 .Fl q
 .Op Fl cTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl cuTv
 .Ar archive file ...
-.Nm ar
+.Nm
 .Fl r
 .Op Fl abciuTv
 .Ar position archive file ...
-.Nm ar
+.Nm
 .Fl t
 .Op Fl \Tv
 .Ar archive [file ...]
-.Nm ar
+.Nm
 .Fl x
 .Op Fl ouTv
 .Ar archive [file ...]
 .Sh DESCRIPTION
 The
-.Nm ar
+.Nm
 utility creates and maintains groups of files combined into an archive.
 Once an archive has been created, new files can be added and existing
 files can be extracted, deleted, or replaced.
@@ -98,7 +98,7 @@ on the command line to ``select'' archive files for an operation, only the
 file with a matching name will be selected.
 .Pp
 The normal use of
-.Nm ar
+.Nm
 is for the creation and maintenance of libraries suitable for use with
 the loader (see
 .Xr ld 1 )
@@ -131,7 +131,7 @@ is written to standard error.
 If the
 .Fl c
 option is specified,
-.Nm ar
+.Nm
 creates the archive silently.
 .It Fl d
 Delete the specified archive files.
@@ -218,14 +218,14 @@ When used with the
 or
 .Fl x
 options,
-.Nm ar
+.Nm
 gives a file-by-file description of the archive modification.
 This description consists of three, white-space separated fields: the
 option letter, a dash (``-'') and the file name.
 When used with the
 .Fl r
 option,
-.Nm ar
+.Nm
 displays the description as above, but the initial letter is an ``a'' if
 the file is added to the archive and an ``r'' if the file replaces a file
 already in the archive.
@@ -243,7 +243,7 @@ followed by two newline characters.
 When used with the
 .Fl t
 option,
-.Nm ar
+.Nm
 displays an ``ls -l'' style listing of information about the members of
 the archive.
 This listing consists of eight, white-space separated fields:
@@ -271,7 +271,7 @@ extracted file or the super-user.
 .El
 .Pp
 The
-.Nm ar
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
@@ -287,14 +287,14 @@ temporary file names
 .El
 .Sh COMPATIBILITY
 By default,
-.Nm ar
+.Nm
 writes archives that may be incompatible with historic archives, as
 the format used for storing archive members with names longer than
 fifteen characters has changed.
 This implementation of
-.Nm ar
+.Nm
 is backward compatible with previous versions of
-.Nm ar
+.Nm
 in that it can read and write (using the
 .Fl T
 option) historic archives.
@@ -307,7 +307,7 @@ See
 for more information.
 .Sh STANDARDS
 The
-.Nm ar
+.Nm
 utility is expected to offer a superset of the
 .St -p1003.2
 functionality.
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index e163cf6cf799..e04e35359dd9 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -42,14 +42,14 @@
 .Fd #include <ar.h>
 .Sh DESCRIPTION
 The archive command
-.Nm ar
+.Nm
 combines several files into one.
 Archives are mainly used as libraries of object files intended to be
 loaded using the link-editor
 .Xr ld 1 .
 .Pp
 A file created with
-.Nm ar
+.Nm
 begins with the ``magic'' string "!<arch>\en".
 The rest of the archive is made up of objects, each of which is composed
 of a header for a file, a possible file name, and the file contents.
@@ -108,7 +108,7 @@ character, although the size in the header does not reflect this.
 .Xr stat 2
 .Sh HISTORY
 There have been at least four
-.Nm ar
+.Nm
 formats.
 The first was denoted by the leading ``magic'' number 0177555 (stored as
 type int).
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 5c67fcf853ad..7861de5d0de7 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -39,7 +39,7 @@
 .Nm banner 
 .Nd print large banner on printer
 .Sh SYNOPSIS
-.Nm banner
+.Nm
 .Op Fl d
 .Op Fl t
 .Op Fl w Ar width
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 8d0a78620792..06b76e6bfa59 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -42,7 +42,7 @@
 .Nm basename , dirname
 .Nd return filename or directory portion of pathname
 .Sh SYNOPSIS
-.Nm basename
+.Nm
 .Ar string
 .Op Ar suffix
 .Nm dirname
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index c7a8e57873c3..5d736960a5cc 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -39,7 +39,7 @@
 .Nm biff
 .Nd "be notified if mail arrives and who it is from"
 .Sh SYNOPSIS
-.Nm biff
+.Nm
 .Op Cm n | y
 .Sh DESCRIPTION
 .Nm Biff
@@ -47,7 +47,7 @@ informs the system whether you want to be notified when mail arrives
 during the current terminal session.
 .Pp
 Options supported by
-.Nm biff :
+.Nm :
 .Bl -tag -width 4n
 .It Cm n
 Disables notification.
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 90144acb2398..5efd4bd71046 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -32,7 +32,7 @@
 .Nm c89
 .Nd Posix.2 C language compiler
 .Sh SYNOPSIS
-.Nm c89
+.Nm
 .Op Fl c
 .Op Fl D Ar name Ns Op Ar =value 
 .Op ...
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index cb26dd351140..0ab1fd091944 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -39,7 +39,7 @@
 .Nm calendar
 .Nd reminder service
 .Sh SYNOPSIS
-.Nm calendar
+.Nm
 .Op Fl a
 .Op Fl A Ar num
 .Op Fl B Ar num
@@ -169,7 +169,7 @@ file in current directory
 .It Pa ~/.calendar
 .Pa calendar
 HOME directory. 
-.Nm calendar
+.Nm
 does a chdir into this directory if it exists.
 .It Pa ~/.calendar/calendar
 calendar file to use if no calendar file exists in the current directory.
@@ -217,7 +217,7 @@ Russian calendar.
 .Xr cron 8
 .Sh COMPATIBILITY
 The
-.Nm calendar
+.Nm
 program previously selected lines which had the correct date anywhere
 in the line.
 This is no longer true, the date is only recognized when it occurs
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index ad4846a72f84..e8c23ebf7a19 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -39,7 +39,7 @@
 .Nm cap_mkdb
 .Nd create capability database
 .Sh SYNOPSIS
-.Nm cap_mkdb
+.Nm
 .Op Fl v
 .Op Fl f Ar outfile
 .Ar file
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 928b905dc546..6d24a5309dbe 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -39,7 +39,7 @@
 .Nm checknr
 .Nd check nroff/troff files
 .Sh SYNOPSIS
-.Nm checknr
+.Nm
 .Op Fl a Ns Ar \&.x1.y1.x2.y2. ... \&.xn.yn
 .Op Fl c Ns Ar \&.x1.x2.x3 ... \&.xn
 .Op Fl s
@@ -55,7 +55,7 @@ input files for certain kinds of errors
 involving mismatched opening and closing delimiters
 and unknown commands.
 If no files are specified,
-.Nm checknr
+.Nm
 checks the standard input.
 .Pp
 Options:
@@ -76,7 +76,7 @@ Define commands which would otherwise be complained about
 as undefined.
 .It Fl f
 Request
-.Nm checknr
+.Nm
 to ignore
 .Ql \ef
 font changes.
@@ -99,7 +99,7 @@ the .TS and .TE macros which must always come in pairs.
 .Pp
 .Nm Checknr
 is intended for use on documents that are prepared with
-.Nm checknr
+.Nm
 in mind, much the same as
 .Xr lint 1 .
 It expects a certain document writing style for
@@ -120,7 +120,7 @@ While it will work to directly go into the next font or explicitly
 specify the original font or point size,
 and many existing documents actually do this,
 such a practice will produce complaints from
-.Nm checknr .
+.Nm .
 Since it is probably better to use the
 .Ql \efP
 and
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 4f3f708a6899..0c4fcf7df5c5 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -42,7 +42,7 @@
 .Nm chflags
 .Nd change file flags
 .Sh SYNOPSIS
-.Nm chflags
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index be4668de7694..b886c1533468 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -8,7 +8,7 @@
 .Nm chkey
 .Nd change your encryption key
 .Sh SYNOPSIS
-.Nm chkey
+.Nm
 .Sh DESCRIPTION
 .Nm Chkey
 prompts the user for their login password,
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 5ec2be1d52dc..60526fae8c05 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -44,14 +44,14 @@
 .Nm ypchsh
 .Nd add or change user database information
 .Sh SYNOPSIS
-.Nm chpass
+.Nm
 .Op Fl a Ar list
 .Op Fl p Ar encpass
 .Op Fl e Ar expiretime
 .Op Fl s Ar newshell
 .Op user
 .Pp
-.Nm chpass
+.Nm
 .Op Fl oly
 .Op Fl a Ar list
 .Op Fl p Ar encpass
@@ -363,7 +363,7 @@ will refuse to update the NIS maps.
 .Pp
 Exception: the super-user on the NIS master server is permitted to
 change a user's NIS password with
-.Nm Ns .
+.Nm .
 .El
 .Pp
 There are also a few extra option flags that are available when
@@ -472,11 +472,11 @@ The
 and
 .Xr ypchsh 1
 commands are really only links to
-.Nm Ns .
+.Nm .
 .Sh BUGS
 User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
-.Nm chpass
+.Nm
 command appeared in 
 .Bx 4.3 Reno .
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 1b36ef8dfca3..02bdafa4ec67 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -43,7 +43,7 @@
 .Nm sum
 .Nd display file checksums and block counts
 .Sh SYNOPSIS
-.Nm cksum
+.Nm
 .Oo 
 .Fl o Ar \&1 Xo
 .No \&|
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index c8a5f2586d3a..fe53d139370b 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -42,18 +42,18 @@
 .Nm cmp
 .Nd compare two files
 .Sh SYNOPSIS
-.Nm cmp
+.Nm
 .Op Fl l | Fl s | Fl x
 .Op Fl z
 .Ar file1 file2
 .Op Ar skip1 Op Ar skip2
 .Sh DESCRIPTION
 The
-.Nm cmp
+.Nm
 utility compares two files of any type and writes the results
 to the standard output.
 By default,
-.Nm cmp
+.Nm
 is silent if the files are the same; if they differ, the byte
 and line number at which the first difference occurred is reported.
 .Pp
@@ -90,7 +90,7 @@ The offset is decimal by default, but may be expressed as an hexadecimal
 or octal value by preceding it with a leading ``0x'' or ``0''.
 .Pp
 The
-.Nm cmp
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width 4n
 .It 0
@@ -102,7 +102,7 @@ the other.
 In the latter case, if the
 .Fl s
 option has not been specified,
-.Nm cmp
+.Nm
 writes to standard error that EOF was reached in the shorter
 file (before any differences were found).
 .It >1
@@ -113,12 +113,12 @@ An error occurred.
 .Xr diff3 1
 .Sh STANDARDS
 The
-.Nm cmp
+.Nm
 utility is expected to be
 .St -p1003.2
 compatible.
 .Sh HISTORY
 A
-.Nm cmp
+.Nm
 command appeared in
 .At v1 .
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 45da8f2d9280..e6a0c1db04ed 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -42,7 +42,7 @@
 .Nm col
 .Nd filter reverse line feeds from input
 .Sh SYNOPSIS
-.Nm col
+.Nm
 .Op Fl bfx
 .Op Fl l Ar num
 .Sh DESCRIPTION
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index ba7d70c7d53e..1881fb3bc709 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -39,7 +39,7 @@
 .Nm colcrt
 .Nd filter nroff output for CRT previewing
 .Sh SYNOPSIS
-.Nm colcrt
+.Nm
 .Op Fl
 .Op Fl \&2
 .Op Ar
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 5073f3588e6f..bfa18f85b1b3 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -32,7 +32,7 @@
 .Nm colldef
 .Nd convert collation sequence source definition
 .Sh SYNOPSIS
-.Nm colldef
+.Nm
 .Op Fl I Ar map_dir
 .Op Fl o Ar out_file
 .Op Ar filename
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index ddc083b3ceb5..288bd1576ff1 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -39,7 +39,7 @@
 .Nm colrm
 .Nd remove columns from a file
 .Sh SYNOPSIS
-.Nm colrm
+.Nm
 .Op Ar start Op Ar stop
 .Sh DESCRIPTION
 .Nm Colrm
@@ -74,6 +74,6 @@ Backspace characters decrement the column count by one.
 .Xr paste 1
 .Sh HISTORY
 The
-.Nm colrm
+.Nm
 command appeared in 
 .Bx 3.0 .
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 22bfea873eae..6ed20ecf0eac 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -39,7 +39,7 @@
 .Nm column
 .Nd columnate lists
 .Sh SYNOPSIS
-.Nm column
+.Nm
 .Op Fl tx
 .Op Fl c Ar columns
 .Op Fl s Ar sep
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 7fe49374dd85..1fbfe71af266 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -42,12 +42,12 @@
 .Nm comm
 .Nd select or reject lines common to two files
 .Sh SYNOPSIS
-.Nm comm
+.Nm
 .Op Fl 123i
 .Ar file1 file2
 .Sh DESCRIPTION
 The
-.Nm comm
+.Nm
 utility reads
 .Ar file1
 and
@@ -93,6 +93,6 @@ exits 0 on success, >0 if an error occurred.
 .Xr uniq 1
 .Sh STANDARDS
 The
-.Nm comm
+.Nm
 utility conforms to
 .St -p1003.2-92 .
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index eea118b1f6b4..5401ca84516a 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -45,7 +45,7 @@
 .Nm zcat
 .Nd compress and expand data
 .Sh SYNOPSIS
-.Nm compress
+.Nm
 .Op Fl cfv
 .Op Fl b Ar bits
 .Op Ar
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index e8b702b69dba..8e78fcdf1645 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -129,7 +129,7 @@ or
 .Xr funopen 3
 .Sh HISTORY
 The
-.Nm zopen
+.Nm
 function
 first appeared in
 .Bx 4.4 .
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 5e841f21b978..f19c5d87a832 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -39,7 +39,7 @@
 .Nm ctags
 .Nd create a tags file
 .Sh SYNOPSIS
-.Nm ctags
+.Nm
 .Op Fl BFadtuwvx
 .Op Fl f Ar tagsfile
 .Ar name ...
@@ -61,7 +61,7 @@ file,
 .Xr ex 1
 can quickly locate these object definitions.
 Depending upon the options provided to
-.Nm ctags ,
+.Nm ,
 objects will consist of subroutines, typedefs, defines, structs,
 enums and unions.
 .Bl -tag -width Ds
@@ -114,7 +114,7 @@ vgrind \-x index
 .It Fl w
 suppress warning diagnostics.
 .It Fl x
-.Nm ctags
+.Nm
 produces a list of object
 names, the line number and file name on which each is defined, as well
 as the text of that line and prints this on the standard output.  This
@@ -152,7 +152,7 @@ trailing
 .Nm \&.c
 and any leading pathname components removed.  This
 makes use of
-.Nm ctags
+.Nm
 practical in directories with more than one
 program.
 .Pp
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index a71e7e1ddac7..712e0cd03356 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -42,21 +42,21 @@
 .Nm cut
 .Nd select portions of each line of a file
 .Sh SYNOPSIS
-.Nm cut
+.Nm
 .Fl b Ar list
 .Op Fl n
 .Op Ar
-.Nm cut
+.Nm
 .Fl c Ar list
 .Op Ar
-.Nm cut
+.Nm
 .Fl f Ar list
 .Op Fl d Ar delim
 .Op Fl s
 .Op Ar
 .Sh DESCRIPTION
 The
-.Nm cut
+.Nm
 utility selects portions of each line (as specified by
 .Ar list  )
 from each
@@ -112,12 +112,12 @@ Unless specified, lines with no delimiters are passed through unmodified.
 .El
 .Pp
 The
-.Nm cut
+.Nm
 utility exits with 0 on success or 1 if an error occurred.
 .Sh SEE ALSO
 .Xr paste 1
 .Sh STANDARDS
 The
-.Nm cut
+.Nm
 utility conforms to
 .St -p1003.2-92 .
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index f0d120d19cb4..72b24897d23b 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -37,7 +37,7 @@
 .Nm doscmd
 .Nd run a subset of real-mode DOS programs
 .Sh SYNOPSIS
-.Nm doscmd
+.Nm
 .Fl 23AbDEfHIMOPRrtVvXxYz
 .Fl c Ar file
 .Fl d Ar file
@@ -60,7 +60,7 @@ or it can be used to emulate a PC and boot DOS,
 which allows it to run a larger variety of DOS applications.
 It should be noted that MS DOS 6.2 and higher appear
 to cause difficulties for
-.Nm doscmd.
+.Nm .
 To boot DOS, either provide the 
 .Fl b
 flag or omit the
@@ -75,18 +75,18 @@ and
 are ignored.
 .Pp
 Although 
-.Nm doscmd
+.Nm
 only provides a subset of DOS, it is sufficient to run a variety of
 programs, including, but not limited to, compilers, assemblers and
 linker-loaders.
 .Pp
 The various flags available to
-.Nm doscmd
+.Nm
 are:
 .Bl -tag -width indent
 .It Fl 2
 Enable debugging traces of every trap to the
-.Nm doscmd
+.Nm
 emulator from the DOS program.
 Note that some traps are handled in the kernel and hence will not
 be traced.
@@ -275,14 +275,14 @@ Enable debugging of the EMS operations.
 .\"
 .It Fl z
 Cause
-.Nm doscmd
+.Nm
 to pause just prior to jumping to the DOS program.
 Very little use except for developing
-.Nm doscmd .
+.Nm .
 .El
 .Pp
 When starting up,
-.Nm doscmd
+.Nm
 attempts to read a configuration file.  First the file
 .Cm .doscmdrc
 in the current directory.  If not found there, the
@@ -318,7 +318,7 @@ is tried.
 .Ar path
 .Xc
 Assigns the
-.Nm BSD/OS
+.Tn BSD/OS
 directory
 .Ar path
 to be assigned as the specified drive.  If the
@@ -510,18 +510,17 @@ the DOS environment.  These are:
 .It Cm MS_VERSION
 The value of this variable is used to determine the version of DOS that
 should be reported by
-.Nm doscmd .
+.Nm .
 Note that
-.Nm doscmd
+.Nm
 will not change the way
 it works, just the way it reports.  By default this value is
 .Cm 410 ,
 which corresponds to
-.Nm "MS DOS
-version
-.Nm 4.1 .
+.Tn "MS DOS
+version 4.1.
 To change it to version 3.2 (the default in previous versions of
-.Nm doscmd )
+.Nm )
 use the value of
 .Cm 320 .
 .It Cm X11_FONT
@@ -540,9 +539,9 @@ to let the X server find it.
 .Sh FILE TRANSLATION
 .Nm Doscmd
 translates
-.Nm BSD/OS
+.Tn BSD/OS
 file names into 
-.Nm DOS
+.Tn DOS
 file names by converting to all upper case and eliminating any invalid
 character.  It does not make any attempt to convert ASCII files into
 the
@@ -729,7 +728,7 @@ naming problems.
 .Sh DIAGNOSTICS
 .Pp
 If
-.Nm doscmd
+.Nm
 encounters an interrupt which is unimplemented, it will print a message
 such as:
 .Pp
@@ -757,5 +756,5 @@ in the source directory (normally
 .An Paul Borman
 .Sh HISTORY
 The
-.Nm doscmd
+.Nm
 program first appeared in BSD/386.
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index b6df798fd4a6..f17d7ea2ff49 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -39,7 +39,7 @@
 .Nm du
 .Nd display disk usage statistics
 .Sh SYNOPSIS
-.Nm du
+.Nm
 .Op Fl P | Fl H | Fl L
 .Op Fl a | s | d Ar depth
 .Op Fl c
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 3f957835d238..7c0402d88c2a 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -8,7 +8,7 @@
 .Nm ee
 .Nd easy editor
 .Sh SYNOPSIS
-.Nm ee
+.Nm
 .Op Fl  eih
 .Op +#
 .Op Ar
@@ -24,7 +24,7 @@ mode unless there is a prompt at the bottom of the terminal, or a
 menu present (in a box in the middle of the terminal).  The command 
 .Nm ree 
 is the same as 
-.Nm Ns , 
+.Nm ,
 but restricted to editing the named 
 file (no file operations, or shell escapes are allowed).
 .Pp
@@ -307,7 +307,7 @@ format paragraphs.  The automatic mode may be set via a menu, or via the
 initialization file.
 .Pp
 There are three states for text operation in
-.Nm Ns :
+.Nm :
 free-form, margins, 
 and automatic formatting.
 .Pp
@@ -359,7 +359,7 @@ You may set these modes via the initialization file (see below), or with a
 menu (see above).
 .Ss "Spell Checking"
 There are two ways to have the spelling in the text checked from
-.Nm Ns .
+.Nm .
 One is by the traditional
 .Xr spell 1
 command, the other is with the 
@@ -423,7 +423,7 @@ Since different users have different preferences,
 allows some 
 slight configurability.  There are three possible locations for an 
 initialization file for
-.Nm Ns :
+.Nm :
 the file
 .Pa /usr/share/misc/init.ee ,
 the file
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index aa025e2028a0..5b968396e8e1 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -59,7 +59,7 @@ examined with
 .Xr ps 1 .
 Thus this option is mainly provided for compatibility with other
 implementations of
-.Nm enigma .
+.Nm .
 .Pp
 When specifying the option
 .Fl s ,
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 269f18f90a6c..ddd5f3f5088d 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -40,7 +40,7 @@
 .Nm unexpand
 .Nd expand tabs to spaces, and vice versa
 .Sh SYNOPSIS
-.Nm expand
+.Nm
 .Op Fl Ns Ar tabstop
 .Op Fl t Ar tab1,tab2,...,tabn
 .Op Ar
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 28339d3b761f..45e030753a7d 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -42,7 +42,7 @@
 .Nm false
 .Nd return false value
 .Sh SYNOPSIS
-.Nm false
+.Nm
 .Sh DESCRIPTION
 .Nm False
 is usually used in a Bourne shell script.
@@ -50,7 +50,7 @@ It tests for the appropriate status "false" before running
 (or failing to run) a list of commands.  
 .Pp
 The
-.Nm false
+.Nm
 utility always exits with a value other than zero.
 .Sh SEE ALSO
 .Xr csh 1 ,
@@ -58,7 +58,7 @@ utility always exits with a value other than zero.
 .Xr true 1
 .Sh STANDARDS
 The
-.Nm false
+.Nm
 utility is expected to be
 .St -p1003.2
 compatible.
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index e50b396b90eb..a2397cd9ecc8 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -6,7 +6,7 @@
 .Nm file
 .Nd determine file type
 .Sh SYNOPSIS
-.Nm file
+.Nm
 .Op Fl vczL
 .Op Fl f Ar namefile
 .Op Fl m Ar magicfiles
@@ -266,7 +266,7 @@ put in multiple levels of `>';
 put in ``beshort'', ``leshort'', etc. keywords to look at numbers in the
 file in a specific byte order, rather than in the native byte order of
 the process running
-.Nm file .
+.Nm .
 .El
 .Pp
 Changes by
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 35752e03d4c8..7d7e1f49e67c 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -41,7 +41,7 @@
 .Nm find
 .Nd walk a file hierarchy
 .Sh SYNOPSIS
-.Nm find
+.Nm
 .Op Fl H | Fl L | Fl P
 .Op Fl Xdsx
 .Op Fl f Ar pathname
@@ -103,12 +103,12 @@ quotes, backslash (``\e''), space, tab and newline characters.
 The
 .Fl d
 option causes
-.Nm find
+.Nm
 to perform a depth\-first traversal, i.e. directories
 are visited in post\-order and all entries in a directory will be acted
 on before the directory itself.
 By default,
-.Nm find
+.Nm
 visits directories in pre\-order, i.e. before their contents.
 Note, the default is
 .Ar not
@@ -117,7 +117,7 @@ a breadth\-first traversal.
 The
 .Fl f
 option specifies a file hierarchy for
-.Nm find
+.Nm
 to traverse.
 File hierarchies may also be specified as the operands immediately
 following the options.
@@ -125,7 +125,7 @@ following the options.
 The
 .Fl s
 option causes
-.Nm find
+.Nm
 to traverse the file hierarchies in lexicographical order,
 i.e., alphabetical order within each directory.
 Note: 
@@ -139,7 +139,7 @@ may give different results.
 The
 .Fl x
 option prevents
-.Nm find
+.Nm
 from descending into directories that have a device number different
 than that of the file from which the descent began.
 .El
@@ -147,27 +147,27 @@ than that of the file from which the descent began.
 .Bl -tag -width Ds
 .It Ic -amin Ar n 
 True if the difference between the file last access time and the time
-.Nm find
+.Nm
 was started, rounded up to the next full minute, is
 .Ar n
 minutes.
 .It Ic -atime Ar n 
 True if the difference between the file last access time and the time
-.Nm find
+.Nm
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
 .It Ic -cmin Ar n 
 True if the difference between the time of last change of file status
 information and the time
-.Nm find
+.Nm
 was started, rounded up to the next full minute, is
 .Ar n
 minutes.
 .It Ic -ctime Ar n 
 True if the difference between the time of last change of file status
 information and the time
-.Nm find
+.Nm
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
@@ -191,7 +191,7 @@ If the string ``{}'' appears anywhere in the utility name or the
 arguments it is replaced by the pathname of the current file.
 .Ar Utility
 will be executed from the directory from which
-.Nm find
+.Nm
 was executed.
 .It Ic -execdir Ar utility Op argument ... ; 
 The
@@ -217,7 +217,7 @@ sysctl vfs
 In addition, there are two pseudo-types, ``local'' and ``rdonly''.
 The former matches any file system physically mounted on the system where
 the
-.Nm find
+.Nm
 is being executed and the latter matches any file system which is
 mounted read-only.
 .It Ic -group Ar gname 
@@ -253,13 +253,13 @@ True if the depth of the current file into the tree is greater than or equal to
 .Ar n .
 .It Ic -mmin Ar n 
 True if the difference between the file last modification time and the time
-.Nm find
+.Nm
 was started, rounded up to the next full minute, is
 .Ar n
 minutes.
 .It Ic -mtime Ar n 
 True if the difference between the file last modification time and the time
-.Nm find
+.Nm
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
@@ -269,7 +269,7 @@ The
 primary is identical to the
 .Ic -exec
 primary with the exception that
-.Nm find
+.Nm
 requests user affirmation for the execution of the utility by printing
 a message to the terminal and reading a response.
 If the response is other than ``y'' the command is not executed and the
@@ -369,7 +369,7 @@ character (character code 0).
 .It Ic -prune
 This primary always evaluates to true.
 It causes
-.Nm find
+.Nm
 to not descend into the current file.
 Note, the
 .Ic -prune
@@ -458,10 +458,10 @@ The second expression is not evaluated if the first expression is true.
 .El
 .Pp
 All operands and primaries must be separate arguments to
-.Nm find  .
+.Nm .
 Primaries which themselves take arguments expect each argument
 to be a separate argument to
-.Nm find  .
+.Nm .
 .Sh EXAMPLES
 .Pp
 The following examples are shown as given to the shell:
@@ -492,7 +492,7 @@ that are newer than ``ttt''.
 .Xr symlink 7
 .Sh STANDARDS
 The
-.Nm find
+.Nm
 utility syntax is a superset of the syntax specified by the
 .St -p1003.2
 standard.
@@ -534,7 +534,7 @@ This version replaces it no matter where in the utility name or arguments
 it appears.
 .Sh BUGS
 The special characters used by
-.Nm find
+.Nm
 are also special characters to many shell programs.
 In particular, the characters ``*'', ``['', ``]'', ``?'', ``('', ``)'',
 ``!'', ``\e'' and ``;'' may have to be escaped from the shell.
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 329a2140d169..e408e1eed30d 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -39,13 +39,13 @@
 .Nm finger
 .Nd user information lookup program
 .Sh SYNOPSIS
-.Nm finger
+.Nm
 .Op Fl lmpshoT
 .Op Ar user ...
 .Op Ar user@host ...
 .Sh DESCRIPTION
 The
-.Nm finger
+.Nm
 displays information about the system users.
 .Pp
 Options are:
@@ -124,7 +124,7 @@ Prevents
 the
 .Fl l
 option of
-.Nm finger
+.Nm
 from displaying the contents of the
 .Dq Pa .forward ,
 .Dq Pa .plan
@@ -141,7 +141,7 @@ users' real names, unless the
 .Fl m
 option is supplied.
 All name matching performed by
-.Nm finger
+.Nm
 is case insensitive.
 .Pp
 .It Fl T
@@ -150,7 +150,7 @@ This option is needed to finger hosts with a broken TCP implementation.
 .El
 .Pp
 If no options are specified,
-.Nm finger
+.Nm
 defaults to the
 .Fl l
 style output if operands are provided, otherwise to the
@@ -160,7 +160,7 @@ Note that some fields may be missing, in either format, if information
 is not available for them.
 .Pp
 If no arguments are specified,
-.Nm finger
+.Nm
 will print an entry for each user currently logged into the system.
 .Pp
 .Nm Finger
@@ -184,7 +184,7 @@ option is the only option that may be passed to a remote machine.
 If the file
 .Dq Pa .nofinger
 exists in the user's home directory,
-.Nm finger
+.Nm
 behaves as if the user in question does not exist.
 .Pp
 The optional
@@ -201,7 +201,7 @@ utilizes the following environment variable, if it exists:
 .Bl -tag -width Fl
 .It Ev FINGER
 This variable may be set with favored options to
-.Nm finger .
+.Nm .
 .El
 .Sh FILES
 .Bl -tag -width /var/log/lastlog -compact
@@ -224,7 +224,7 @@ last login data base
 .Re
 .Sh HISTORY
 The
-.Nm finger
+.Nm
 command appeared in
 .Bx 3.0 .
 .Sh BUGS
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index a37121d6c8a7..31c92bbbad45 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -39,7 +39,7 @@
 .Nm fold
 .Nd "fold long lines for finite width output device"
 .Sh SYNOPSIS
-.Nm fold
+.Nm
 .Op Fl w Ar width
 .Ar
 .Sh DESCRIPTION
@@ -57,7 +57,7 @@ should be a multiple of 8 if tabs are present, or the tabs should
 be expanded using
 .Xr expand 1
 before using
-.Nm fold .
+.Nm .
 .El
 .Sh SEE ALSO
 .Xr expand 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 0078a9e6b5d6..9e9317e05e46 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -39,7 +39,7 @@
 .Nm from
 .Nd print names of those who have sent mail
 .Sh SYNOPSIS
-.Nm from
+.Nm
 .Op Fl c
 .Op Fl s Ar sender
 .Op Fl f Ar file
@@ -90,6 +90,6 @@ in /var/mail is used.
 .Xr mail 1
 .Sh HISTORY
 The
-.Nm from
+.Nm
 command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index c07616b3bc2c..c7034d1a9a79 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -39,7 +39,7 @@
 .Nm fstat
 .Nd file status
 .Sh SYNOPSIS
-.Nm fstat
+.Nm
 .Op Fl fmnv
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -53,7 +53,7 @@ A file is considered open by a process if it was explicitly opened,
 is the working directory, root directory, active executable text, or kernel
 trace file for that process.
 If no options are specified,
-.Nm fstat
+.Nm
 reports on all open files in the system.
 .Pp
 Options:
@@ -94,10 +94,10 @@ Verbose mode.  Print error messages upon failures to locate particular
 system data structures rather than silently ignoring them.  Most of
 these data structures are dynamically created or deleted and it is
 possible for them to disappear while
-.Nm fstat
+.Nm
 is running.  This
 is normal and  unavoidable since the rest of the system is running while
-.Nm fstat
+.Nm
 itself is running.
 .It Ar filename ...
 Restrict reports to the specified files.
@@ -206,7 +206,7 @@ an arrow (``<-'' or ``->''), and a full duplex socket shows a double arrow
 (``<->'').
 .Sh BUGS
 Since
-.Nm fstat
+.Nm
 takes a snapshot of the system, it is only correct for a very short period
 of time.
 .Sh SEE ALSO
diff --git a/usr.bin/fsync/fsync.1 b/usr.bin/fsync/fsync.1
index 4bbceb8c00e2..d6b6f66ef9ba 100644
--- a/usr.bin/fsync/fsync.1
+++ b/usr.bin/fsync/fsync.1
@@ -31,7 +31,7 @@
 .Nm fsync
 .Nd synchronize a file's in-core state with that on disk
 .Sh SYNOPSIS
-.Nm fsync
+.Nm
 .Ar
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index e51199304b38..4681b690bbeb 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -48,11 +48,11 @@ file transfer program
 .Op Fl P Ar port
 .Op Fl s Ar src_addr
 .Op Ar host Op Ar port
-.Nm ftp
+.Nm
 ftp://[\fIuser\fR:\fIpassword\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
-.Nm ftp
+.Nm
 http://\fIhost\fR[:\fIport\fR]/\fIfile\fR
-.Nm ftp
+.Nm
 \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
 .Sh DESCRIPTION
 .Nm
@@ -157,7 +157,7 @@ is awaiting commands from the user the prompt
 is provided to the user.
 The following commands are recognized
 by
-.Nm ftp  :
+.Nm :
 .Bl -tag -width Fl
 .It Ic \&! Op Ar command Op Ar args
 Invoke an interactive shell on the local machine.
@@ -209,7 +209,7 @@ Terminate the
 .Tn FTP
 session with the remote server
 and exit
-.Nm ftp .
+.Nm .
 An end of file will also terminate the session and exit.
 .It Ic case
 Toggle remote computer file name case mapping during
@@ -954,7 +954,7 @@ Return size of
 on remote machine.
 .It Ic status
 Show the current status of
-.Nm ftp .
+.Nm .
 .It Ic struct Op Ar struct-name
 Set the file transfer
 .Ar structure
@@ -1421,7 +1421,7 @@ The
 and
 .Xr gate-ftp 1
 commands are links to
-.Nm ftp .
+.Nm .
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/genassym/genassym.8 b/usr.bin/genassym/genassym.8
index 5f2bb41feba3..3841a0b8b150 100644
--- a/usr.bin/genassym/genassym.8
+++ b/usr.bin/genassym/genassym.8
@@ -8,7 +8,7 @@
 .Nm genassym
 .Nd generate assembler symbols from C
 .Sh SYNOPSIS
-.Nm genassym
+.Nm
 .Op Fl o Ar outfile
 .Ar objfile
 .Sh DESCRIPTION
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index 8b0bf59073a0..8d16d6e7ef59 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -8,7 +8,7 @@
 .Nm gensetdefs
 .Nd generate linker set definitions
 .Sh SYNOPSIS
-.Nm gensetdefs
+.Nm
 .Ar file ...
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 7ce8984f0b4f..1e3d2e5ebf45 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -35,17 +35,17 @@
 .Nm getconf
 .Nd retrieve standard configuration variables
 .Sh SYNOPSIS
-.Nm getconf
+.Nm
 .Op Fl v Ar environment
 .Ar path_var
 .Ar file
 .Pp
-.Nm getconf
+.Nm
 .Op Fl v Ar environment
 .Ar system_var
 .Sh DESCRIPTION
 The
-.Nm getconf
+.Nm
 utility outputs the value of
 .Tn POSIX
 or
@@ -95,7 +95,7 @@ The
 option is not supported, but provided for compatibility purposes.
 .Sh DIAGNOSTICS
 The
-.Nm getconf
+.Nm
 utility exits 0 on success or >0 if an error occurred.
 Use of a
 .Ar system_var
@@ -134,12 +134,12 @@ directory.
 .Xr sysconf 3
 .Sh STANDARDS
 The
-.Nm getconf
+.Nm
 utility is expected to be compliant with
 .St -susv2 .
 .Sh HISTORY
 The
-.Nm getconf
+.Nm
 command first appeared in
 .Fx 5.0 .
 .Sh BUGS
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 6563216dcb3f..d555b06af050 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -108,17 +108,17 @@ has.
 Arguments containing white space or embedded shell metacharacters
 generally will not survive intact;  this looks easy to fix but
 isn't. People trying to fix 
-.Nm getopt
+.Nm
 or the example in this manpage should check the history of this file
 in
 .Fx .
 .Pp
 The error message for an invalid option is identified as coming
 from
-.Nm getopt
+.Nm
 rather than from the shell procedure containing the invocation
 of
-.Nm getopt ;
+.Nm ;
 this again is hard to fix.
 .Pp
 The precise best way to use the
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index b251defa51d2..b0cc35992bcf 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -39,7 +39,7 @@
 .Nm gprof
 .Nd display call graph profile data
 .Sh SYNOPSIS
-.Nm gprof
+.Nm
 .Op options
 .Op Ar a.out Op Ar a.out.gmon ...
 .Sh DESCRIPTION
@@ -69,7 +69,7 @@ of the executable with the suffix
 appended.
 If more than one profile file is specified,
 the
-.Nm gprof
+.Nm
 output shows the sum of the profile information in the given profile files.
 .Pp
 .Nm Gprof
@@ -122,7 +122,7 @@ Find a minimal set of arcs that can be broken to eliminate all cycles with
 or more members.
 Caution: the algorithm used to break cycles is exponential,
 so using this option may cause 
-.Nm gprof
+.Nm
 to run for a very long time.
 .It Fl e Ar name 
 Suppresses the printing of the graph profile entry for routine
@@ -270,7 +270,7 @@ Summarized dynamic call graph and profile.
 .Re
 .Sh HISTORY
 The
-.Nm gprof
+.Nm
 profiler
 appeared in
 .Bx 4.2 .
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 8e333a5d3ab7..bef33022b564 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -39,7 +39,7 @@
 .Nm head
 .Nd display first lines of a file
 .Sh SYNOPSIS
-.Nm head
+.Nm
 .Op Fl n Ar count
 .Op Fl c Ar bytes
 .Op Ar file ...
@@ -62,12 +62,12 @@ where
 is the name of the file.
 .Pp
 The
-.Nm head
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr tail 1
 .Sh HISTORY
 The
-.Nm head
+.Nm
 command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 71a8caa9d7f2..1cb9e7ea90c9 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -36,10 +36,10 @@
 .Dt HEXDUMP 1
 .Os
 .Sh NAME
-.Nm hexdump, hd
+.Nm hexdump , hd
 .Nd ASCII, decimal, hexadecimal, octal dump
 .Sh SYNOPSIS
-.Nm hexdump
+.Nm
 .Op Fl bcCdovx
 .Op Fl e Ar format_string
 .Op Fl f Ar format_file
@@ -58,7 +58,9 @@
 .Ek
 .Ar file  ...
 .Sh DESCRIPTION
-The hexdump utility is a filter which displays the specified files, or
+The
+.Nm
+utility is a filter which displays the specified files, or
 the standard input, if no files are specified, in a user specified
 format.
 .Pp
@@ -137,7 +139,9 @@ respectively.
 .It Fl v
 The
 .Fl v
-option causes hexdump to display all input data.
+option causes
+.Nm
+to display all input data.
 Without the
 .Fl v
 option, any number of groups of output lines, which would be
@@ -152,7 +156,7 @@ data, in hexadecimal, per line.
 .El
 .Pp
 For each input file,
-.Nm hexdump
+.Nm
 sequentially copies the input to standard output, transforming the
 data according to the format strings specified by the
 .Fl e
@@ -214,7 +218,8 @@ described in the C standard are supported:
 .Ed
 .El
 .Pp
-Hexdump also supports the following additional conversion strings:
+.Nm Hexdump
+also supports the following additional conversion strings:
 .Bl -tag -width Fl
 .It Cm \&_a Ns Op Cm dox 
 Display the input offset, cumulative across input files, of the
@@ -286,7 +291,9 @@ not have a specified iteration count, have the iteration count
 incremented until the entire input block has been processed or there
 is not enough data remaining in the block to satisfy the format string.
 .Pp
-If, either as a result of user specification or hexdump modifying
+If, either as a result of user specification or
+.Nm
+modifying
 the iteration count as described above, an iteration count is
 greater than one, no trailing whitespace characters are output
 during the last iteration.
@@ -324,7 +331,7 @@ to specifying the
 .Fl x
 option.
 .Pp
-.Nm hexdump
+.Nm
 exits 0 on success and >0 if an error occurred.
 .Sh EXAMPLES
 Display the input in perusal format:
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index ba11227cc57d..cdd6f0bedf5a 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -39,7 +39,7 @@
 .Nm od
 .Nd octal, decimal, hex, ASCII dump
 .Sh SYNOPSIS
-.Nm od
+.Nm
 .Op Fl aBbcDdeFfHhIiLlOovXx
 .Sm off
 .Oo
@@ -56,7 +56,7 @@ has been deprecated in favor of
 .Pp
 .Nm Hexdump ,
 if called as
-.Nm od ,
+.Nm ,
 provides compatibility for the options listed above.
 .Pp
 It does not provide compatibility for the
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index a51b601aa9cb..3913463a46fe 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -39,7 +39,7 @@
 .Nm groups
 .Nd show group memberships
 .Sh SYNOPSIS
-.Nm groups
+.Nm
 .Op Ar user
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 4e06136af00b..8d6d075fb83e 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -42,21 +42,21 @@
 .Nm id
 .Nd return user identity
 .Sh SYNOPSIS
-.Nm id
+.Nm
 .Op Ar user
-.Nm id
+.Nm
 .Fl G Op Fl n
 .Op Ar user
-.Nm id
+.Nm
 .Fl P
 .Op Ar user
-.Nm id
+.Nm
 .Fl g Op Fl nr
 .Op Ar user
-.Nm id
+.Nm
 .Fl p
 .Op Ar user
-.Nm id
+.Nm
 .Fl u Op Fl nr
 .Op Ar user
 .Sh DESCRIPTION
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 0780b130c061..d02ccdaca00d 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -39,7 +39,7 @@
 .Nm whoami
 .Nd display effective user id
 .Sh SYNOPSIS
-.Nm whoami
+.Nm
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index b75fd782d1d6..59ab94d61ebd 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -114,7 +114,7 @@ checks to make sure it is different from
 .Ar input-file  .
 .Pp
 The options listed below control the formatting style imposed by
-.Nm indent  .
+.Nm .
 .Bl -tag -width Op
 .It Fl bad , nbad
 If
@@ -443,6 +443,5 @@ A common mistake that often causes grief is typing:
 .Dl indent *.c
 .Pp
 to the shell in an attempt to indent all the
-.Nm C
-programs in a directory.
+C programs in a directory.
 This is probably a bug, not a feature.
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index b52961465f65..ae8db9c28c58 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -135,7 +135,7 @@ is not guaranteed to be consistent.
 .Sh BUGS
 This manual page is woefully incomplete, because it does not
 at all attempt to explain the information printed by
-.Nm ipcs .
+.Nm .
 .Sh FILES
 .Bl -tag -width /etc/passwd -compact
 .It Pa /dev/kmem
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 9e9bfb731358..57c3b2b70494 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -42,7 +42,7 @@
 .Nm join
 .Nd relational database operator
 .Sh SYNOPSIS
-.Nm join
+.Nm
 .Oo
 .Fl a Ar file_number | Fl v Ar file_number
 .Oc
@@ -175,7 +175,7 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh COMPATIBILITY
 For compatibility with historic versions of
-.Nm Ns ,
+.Nm ,
 the following options are available:
 .Bl -tag -width indent
 .It Fl a
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 68fc42e35ec4..9f587d30e4e2 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -39,7 +39,7 @@
 .Nm jot
 .Nd print sequential or random data
 .Sh SYNOPSIS
-.Nm jot
+.Nm
 .Op Fl cnr
 .Op Fl b Ar word
 .Op Fl w Ar word
diff --git a/usr.bin/kenv/kenv.1 b/usr.bin/kenv/kenv.1
index e80b9443270a..8743a6f3ebe6 100644
--- a/usr.bin/kenv/kenv.1
+++ b/usr.bin/kenv/kenv.1
@@ -30,11 +30,11 @@
 .Nm kenv
 .Nd dump the kernel environment
 .Sh SYNOPSIS
-.Nm kenv
+.Nm
 .Op Fl h
 .Op variable
 .Sh DESCRIPTION
-.Nm kenv
+.Nm
 will dump the kernel environment.
 If the
 .Fl h
@@ -45,6 +45,6 @@ will only report that value.
 .Sh SEE ALSO
 .Xr loader 8
 .Sh HISTORY
-.Nm kenv
+.Nm
 appeared in
 .Fx 5.0 .
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index ec2447118e70..56f1e4f5ec87 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -31,7 +31,7 @@
 .Nm killall
 .Nd kill processes by name
 .Sh SYNOPSIS
-.Nm killall
+.Nm
 .Op Fl d \&| Ns Fl v
 .Op Fl h \&| Ns Fl \&?
 .Op Fl help
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 20a461a39410..dd1856ce6146 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -39,13 +39,13 @@
 .Nm ktrace
 .Nd enable kernel process tracing
 .Sh SYNOPSIS
-.Nm ktrace
+.Nm
 .Op Fl aCcdi
 .Op Fl f Ar trfile
 .Op Fl g Ar pgrp
 .Op Fl p Ar pid
 .Op Fl t Ar trstr
-.Nm ktrace
+.Nm
 .Op Fl adi
 .Op Fl f Ar trfile
 .Op Fl t Ar trstr
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 5644e99ee1dc..6c170237cc9c 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -44,7 +44,7 @@
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
 .Ar file ...
-.Nm lam
+.Nm
 .Op Fl p Ar min.max
 .Op Fl s Ar sepstring
 .Op Fl t Ar c 
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 2bdfc50c47ab..78e69e46e0b6 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -39,7 +39,7 @@
 .Nm last
 .Nd indicate last logins of users and ttys
 .Sh SYNOPSIS
-.Nm last
+.Nm
 .Op Fl Ns Ar n
 .Op Fl f Ar file
 .Op Fl h Ar host
@@ -59,7 +59,7 @@ the user name, the tty from which the session was conducted, any
 hostname, the start and stop times for the session, and the duration
 of the session.  If the session is still continuing or was cut short by
 a crash or shutdown,
-.Nm last
+.Nm
 will so indicate.
 .Pp
 .Bl -tag -width indent-two
@@ -101,7 +101,7 @@ would list all of
 sessions as well as all sessions on the console terminal.
 If no
 users, hostnames or terminals are specified,
-.Nm last
+.Nm
 prints a record of
 all logins and logouts.
 .Pp
@@ -112,10 +112,10 @@ logs in at reboots of the system, thus
 will give an indication of mean time between reboot.
 .Pp
 If
-.Nm last
+.Nm
 is interrupted, it indicates to what date the search has
 progressed.  If interrupted with a quit signal
-.Nm last
+.Nm
 indicates how
 far the search has progressed and then continues.
 .Sh FILES
@@ -131,7 +131,7 @@ login data base
 If a login shell should terminate abnormally for some reason, it is likely
 that a logout record won't be written to the wtmp file.
 In this case,
-.Nm last
+.Nm
 will indicate the logout time as "shutdown".
 .Sh HISTORY
 .Nm Last
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index 4b27839d3c1e..70804b903bb2 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -7,7 +7,7 @@
 .Nm ldd
 .Nd list dynamic object dependencies
 .Sh SYNOPSIS
-.Nm ldd
+.Nm
 .Op Fl v
 .Op Fl f Ar format
 .Ar program ...
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 35dc52d9c438..cb13e2a051be 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -26,24 +26,24 @@
 .Nm limits
 .Nd set or display process resource limits
 .Sh SYNOPSIS
-.Nm limits
+.Nm
 .Op Fl C Ar class
 .Op Fl SHB
 .Op Fl ea
 .Op Fl cdflmnstu Op val
-.Nm limits
+.Nm
 .Op Fl C Ar class
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
 .Op Fl E
 .Op Ar name=value ...
 .Op Ar command
-.Nm limits
+.Nm
 .Op Fl U Ar user
 .Op Fl SHB
 .Op Fl ea
 .Op Fl cdflmnstu Op val
-.Nm limits
+.Nm
 .Op Fl U Ar user
 .Op Fl SHB
 .Op Fl cdflmnstu Op val
@@ -61,7 +61,8 @@ Three uses of the
 command are possible:
 .Pp
 .Bl -hang -width indent
-.It Nm limits Op Ar limitflags
+.It Nm
+.Op Ar limitflags
 .Op Ar name=value
 .Ar command
 .Pp
@@ -70,7 +71,8 @@ This usage sets limits according to
 optionally sets environment variables given as
 .Ar name=value
 pairs, and then runs the specified command.
-.It Nm limits Op Ar limitflags
+.It Nm
+.Op Ar limitflags
 .Pp
 This usage determines values of resource settings according to
 .Ar limitflags ,
@@ -87,7 +89,8 @@ by the the appropriate login class resource limit entries from
 the
 .Xr login.conf 5
 login capabilities database.
-.It Nm limits Fl e Op Ar limitflags
+.It Nm
+.Fl e Op Ar limitflags
 .Pp
 This usage determines values of resource settings according to
 .Ar limitflags ,
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index d3538ed2fe0f..05ae530e7b63 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -39,7 +39,7 @@
 .Nm lock
 .Nd reserve a terminal
 .Sh SYNOPSIS
-.Nm lock
+.Nm
 .Op Fl n
 .Op Fl p
 .Op Fl t Ar timeout
@@ -67,6 +67,6 @@ minutes.
 .El
 .Sh HISTORY
 The
-.Nm lock
+.Nm
 command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 35077ad203a9..873f31d1945a 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -9,7 +9,7 @@
 .Nm lsvfs
 .Nd list installed virtual file systems
 .Sh SYNOPSIS
-.Nm lsvfs
+.Nm
 .Op Ar vfsname Ar ...
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 681befcd7dc9..3dfef30bbe8a 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -8,7 +8,7 @@
 .Nm m4
 .Nd macro language processor
 .Sh SYNOPSIS
-.Nm m4
+.Nm
 .Oo
 .Fl D Ns Ar name Ns Op Ar =value
 .Oc
@@ -17,7 +17,7 @@
 \|.\|.\|.
 .Sh DESCRIPTION
 The
-.Nm m4
+.Nm
 utility is a macro processor that can be used as a front end to any
 language (e.g., C, ratfor, fortran, lex, and yacc).
 Each of the argument files is processed in order.
@@ -52,7 +52,7 @@ Undefine the symbol
 .Ar name .
 .El
 .Sh SYNTAX
-.Nm m4
+.Nm
 provides the following built-in macros.  They may be
 redefined, losing their original meaning.
 Return values are NULL unless otherwise stated.
@@ -82,7 +82,7 @@ macro definitions (even for built-in macros).
 .It divert
 There are 10 output queues (numbered 0-9).
 At the end of processing
-.Nm m4
+.Nm
 concatenates all the queues in numerical order to produce the
 final output.  Initially the output queue is 0.  The divert
 macro allows you to select a new output queue (an invalid argument
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index f9ce04ede488..bef3d40c6506 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -39,18 +39,18 @@
 .Nm mail
 .Nd send and receive mail
 .Sh SYNOPSIS
-.Nm mail
+.Nm
 .Op Fl iInv
 .Op Fl s Ar subject
 .Op Fl c Ar cc-addr
 .Op Fl b Ar bcc-addr
 .Ar to-addr ...
 .Op \&- Ar sendmail-option ...
-.Nm mail
+.Nm
 .Op Fl iInNv
 .Fl f
 .Op Ar name
-.Nm mail
+.Nm
 .Op Fl iInNv
 .Op Fl u Ar user
 .Sh INTRODUCTION
@@ -69,7 +69,7 @@ delivery are displayed on the user's terminal.
 Ignore tty interrupt signals.
 This is
 particularly useful when using
-.Nm mail
+.Nm
 on noisy phone lines.
 .It Fl I
 Forces mail to run in interactive mode even when
@@ -105,7 +105,7 @@ Read in the contents of your
 (or the specified file)
 for processing; when you
 .Ar quit  ,
-.Nm mail
+.Nm
 writes undeleted messages back to this file.
 .It Fl u
 Is equivalent to:
@@ -132,7 +132,7 @@ new message is to be sent, or whether an existing mailbox is to
 be read.
 .Ss Sending mail
 To send a message to one or more people,
-.Nm mail
+.Nm
 can be invoked with arguments which are the names of people to
 whom the mail will be sent.
 You are then expected to type in
@@ -143,12 +143,12 @@ at the beginning of a line.
 The section below
 .Ar Replying to or originating mail ,
 describes some features of
-.Nm mail
+.Nm
 available to help you compose your letter.
 .Pp
 .Ss Reading mail
 In normal usage
-.Nm mail
+.Nm
 is given no arguments and checks your mail out of the
 post office, then
 prints out a one line header of each message found.
@@ -175,13 +175,13 @@ the message or
 .Pq Ic r
 to it.
 Deletion causes the
-.Nm mail
+.Nm
 program to forget about the message.
 This is not irreversible; the message can be
 .Ic undeleted
 .Pq Ic u
 by giving its number, or the
-.Nm mail
+.Nm
 session can be aborted by giving the
 .Ic exit
 .Pq Ic x
@@ -220,7 +220,7 @@ person who it was from.
 Text you then type in, up to an end-of-file,
 defines the contents of the message.
 While you are composing a message,
-.Nm mail
+.Nm
 treats lines beginning with the character
 .Ql Ic \&~
 specially.
@@ -239,7 +239,7 @@ are given in the summary below.)
 .Pp
 .Ss Ending a mail processing session.
 You can end a
-.Nm mail
+.Nm
 session with the
 .Ic quit
 .Pq Ic q
@@ -268,7 +268,7 @@ in your home directory.
 The current list of such aliases can be displayed with the
 .Ic alias
 command in
-.Nm mail  .
+.Nm .
 System wide distribution lists can be created by editing
 .Pa /etc/mail/aliases ,
 see
@@ -314,7 +314,7 @@ command's requirements is used.
 If there are no messages forward of
 the current message, the search proceeds backwards, and if there are no
 good messages at all,
-.Nm mail
+.Nm
 types
 .Dq Li No applicable messages
 and
@@ -372,12 +372,12 @@ The
 .Ic alternates
 command is useful if you have accounts on several machines.
 It can be used to inform
-.Nm mail
+.Nm
 that the listed addresses are really you.
 When you
 .Ic reply
 to messages,
-.Nm mail
+.Nm
 will not send a copy of the message to any of the addresses
 listed on the
 .Ic alternates
@@ -410,7 +410,7 @@ nor will they be available for most other commands.
 .Ic dt )
 Deletes the current message and prints the next message.
 If there is no next message,
-.Nm mail
+.Nm
 says
 .Dq Li "at EOF" .
 .It Ic edit
@@ -693,7 +693,7 @@ presents message headers in windowfuls as described under the
 .Ic headers
 command.
 You can move
-.Nm mail Ns 's
+.Nm Ns 's
 attention forward to the next window with the
 .Ic \&z
 command.
@@ -829,7 +829,7 @@ This should always be set (preferably in one of the system-wide
 files).
 .It Ar ask
 Causes
-.Nm mail
+.Nm
 to prompt you for the subject of each message you send.
 If
 you respond with simply a newline, no subject field will be sent.
@@ -851,14 +851,14 @@ Setting the binary option
 is the same as specifying
 .Fl d
 on the command line and causes
-.Nm mail
+.Nm
 to output all sorts of information useful for debugging
-.Nm mail  .
+.Nm .
 .It Ar dot
 The binary option
 .Ar dot
 causes
-.Nm mail
+.Nm
 to interpret a period alone on a line as the terminator
 of a message you are sending.
 .It Ar hold
@@ -873,11 +873,11 @@ An option related to
 is
 .Ar ignoreeof
 which makes
-.Nm mail
+.Nm
 refuse to accept a control-d as the end of a message.
 .Ar Ignoreeof
 also applies to
-.Nm mail
+.Nm
 command mode.
 .It Ar metoo
 Usually, when a group is expanded that contains the sender, the sender
@@ -894,7 +894,7 @@ flag on the command line.
 Normally, when you abort a message with two
 .Tn RUBOUT
 (erase or delete)
-.Nm mail
+.Nm
 copies the partial letter to the file
 .Dq Pa dead.letter
 in your home directory.
@@ -984,7 +984,7 @@ use in the place of ~ to denote escapes.
 The name of the directory to use for storing folders of
 messages.
 If this name begins with a `/',
-.Nm mail
+.Nm
 considers it to be an absolute pathname; otherwise, the
 folder directory is found relative to your home directory.
 .It Ev MBOX
@@ -1067,7 +1067,7 @@ Most are
 not useful to the general user.
 .Pp
 Usually,
-.Nm mail
+.Nm
 is just a link to
 .Nm Mail  ,
 which can be confusing.
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 5016bd333ff2..c6655dc0067c 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -39,7 +39,7 @@
 .Nm make
 .Nd maintain program dependencies
 .Sh SYNOPSIS
-.Nm make
+.Nm
 .Op Fl BPSXeiknqrstv
 .Op Fl D Ar variable
 .Op Fl d Ar flags
@@ -206,7 +206,7 @@ Rather than re-building a target as specified in the makefile, create it
 or update its modification time to make it appear up-to-date.
 .It Fl V Ar variable
 Print
-.Nm make Ns 's
+.Nm Ns 's
 idea of the value of
 .Ar variable ,
 in the global context.
@@ -369,7 +369,7 @@ are:
 .Bl -tag -width Ds
 .It Environment variables
 Variables defined as part of
-.Nm make Ns 's
+.Nm Ns 's
 environment.
 .It Global variables
 Variables defined in the makefile or in included makefiles.
@@ -506,14 +506,14 @@ The environment variable
 .Ev MAKEFLAGS
 may contain anything that
 may be specified on
-.Nm make Ns 's
+.Nm Ns 's
 command line.
 Its contents are stored in
-.Nm make Ns 's
+.Nm Ns 's
 .Va .MAKEFLAGS
 variable.
 Anything specified on
-.Nm make Ns 's
+.Nm Ns 's
 command line is appended to the
 .Va .MAKEFLAGS
 variable which is then
@@ -649,7 +649,7 @@ the rest of the modifier.
 .It Cm Q
 Quotes every shell meta-character in the variable, so that it can be passed
 safely through recursive invocations of
-.Nm make .
+.Nm .
 .It Cm R
 Replaces each word in the variable with everything but its suffix.
 .Sm off
@@ -725,7 +725,7 @@ Converts variable to upper-case letters.
 .Sh DIRECTIVES, CONDITIONALS, AND FOR LOOPS
 Directives, conditionals, and for loops reminiscent
 of the C programming language are provided in
-.Nm make .
+.Nm .
 All such structures are identified by a line beginning with a single
 dot
 .Pq Ql \&.
@@ -749,7 +749,7 @@ Terminate processing of the makefile immediately.
 The filename of the
 makefile, the line on which the error was encountered and the specified
 message are printed to standard output and
-.Nm make
+.Nm
 terminates with exit code 1.  Variables in the message are expanded.
 .El
 .Pp
@@ -873,7 +873,7 @@ has been defined.
 .It Ic make
 Takes a target name as an argument and evaluates to true if the target
 was specified as part of
-.Nm make Ns 's
+.Nm Ns 's
 command line or was declared the default target (either implicitly or
 explicitly, see
 .Va .MAIN )
@@ -982,7 +982,7 @@ or
 .Fl t
 options were specified.
 Normally used to mark recursive
-.Nm make Ns 's .
+.Nm Ns 's .
 .It Ic .NOTMAIN
 Normally
 .Nm
@@ -1005,7 +1005,7 @@ as if they all were preceded by an at sign
 .Pq Ql @ .
 .It Ic .USE
 Turn the target into
-.Nm make Ns 's
+.Nm Ns 's
 version of a macro.
 When the target is used as a source for another target, the other target
 acquires the commands, sources, and attributes (except for
@@ -1152,7 +1152,7 @@ attribute is applied to every
 command in the file.
 .It Ic .SUFFIXES
 Each source specifies a suffix to
-.Nm make .
+.Nm .
 If no sources are specified, any previous specified suffices are deleted.
 .Sh COMPATIBILITY
 Older versions of
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 48a60ea11324..fad6fa6d6ccc 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -31,7 +31,7 @@
 .Nm minigzip
 .Nd minimal implementation of the 'gzip' compression tool
 .Sh SYNOPSIS
-.Nm minigzip
+.Nm
 .Op Fl d
 .Op Ar file ...
 .Sh DESCRIPTION
diff --git a/usr.bin/mk_cmds/mk_cmds.1 b/usr.bin/mk_cmds/mk_cmds.1
index 4cc0814471e6..c7e89bb69700 100644
--- a/usr.bin/mk_cmds/mk_cmds.1
+++ b/usr.bin/mk_cmds/mk_cmds.1
@@ -30,7 +30,7 @@
 .Nm mk_cmds
 .Nd generate commands from table file
 .Sh SYNOPSIS
-.Nm mk_cmds
+.Nm
 .Ar cmdtbl.ct
 .Sh DESCRIPTION
 The
@@ -88,7 +88,7 @@ unimplemented ss_lasttest,
 lasttest, lt;
 .Sh HISTORY
 The
-.Nm mk_cmds
+.Nm
 utility
 was written by the MIT Student Information Processing Board and
 appeared before
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index fb19a20ccda1..02721024e32c 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -75,7 +75,7 @@ The options are as follows:
 .It Fl a
 Append to the output file,
 so that multiple
-.Nm mkdep Ns 's
+.Nm Ns 's
 may be run from a single Makefile.
 .It Fl f
 Write the include file dependencies to 
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index a55e3e3f0619..e221609fe5e9 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -42,18 +42,18 @@
 .Nm mklocale
 .Nd make LC_CTYPE locale files
 .Sh SYNOPSIS
-.Nm mklocale
+.Nm
 .Op Fl d
 .Ar "< src-file"
 .Ar "> language/LC_CTYPE"
-.Nm mklocale
+.Nm
 .Op Fl d
 .Fl o
 .Ar language/LC_CTYPE
 .Ar src-file
 .Sh DESCRIPTION
 The
-.Nm mklocale
+.Nm
 utility reads a
 .Dv LC_CTYPE
 source file from standard input and produces a
@@ -142,7 +142,7 @@ No translation and the default.
 .It Dv UTF2
 .Dv "Universal character set Transformation Format"
 adopted from
-.Nm "Plan 9 from Bell Labs" .
+.Tn "Plan 9 from Bell Labs" .
 This is the preferred encoding.
 .It Dv EUC
 .Dv EUC
@@ -201,11 +201,9 @@ Defines a map from runes to their digit value.
 is the integer value represented  by
 .Dv RUNE1 .
 For example, the ASCII character
-.Nm '0'
-would map to the decimal value
-.Nm 0 .
-Only values up to
-.Nm 255
+.Ql 0
+would map to the decimal value 0.
+Only values up to 255
 are allowed.
 .El
 .Pp
@@ -260,10 +258,10 @@ Defines runes which are phonograms, printable and graphic.
 .Xr utf2 4
 .Sh BUGS
 The
-.Nm mklocale
+.Nm
 utility is overly simplistic.
 .Sh HISTORY
 The
-.Nm mklocale
+.Nm
 utility first appeared in
 .Bx 4.4 .
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 0e674045a732..210c68c897d0 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -39,13 +39,13 @@
 .Nm mktemp
 .Nd make temporary file name (unique)
 .Sh SYNOPSIS
-.Nm mktemp
+.Nm
 .Op Fl d
 .Op Fl q
 .Op Fl t Ar prefix
 .Op Fl u
 .Ar template ...
-.Nm mktemp
+.Nm
 .Op Fl d
 .Op Fl q
 .Op Fl u
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 4a1adb51947c..189936cb8c65 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -43,9 +43,9 @@
 .Op Fl fhlpq
 .Op Ar number
 .Op Ar \-number
-.Nm msgs
+.Nm
 .Op Fl s
-.Nm msgs
+.Nm
 .Op Fl c
 .Op \-days
 .Sh DESCRIPTION
@@ -81,7 +81,7 @@ and go on to the next message.
 Redisplay the last message.
 .It Fl q
 Drop out of
-.Nm msgs ;
+.Nm ;
 the next time
 .Nm
 will pick up where it last left off.
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index b3545f97fcdf..2b79a44048d5 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -40,7 +40,7 @@
 .Nm mt
 .Nd magnetic tape manipulating program
 .Sh SYNOPSIS
-.Nm mt
+.Nm
 .Op Fl f Ar tapename
 .Ar command
 .Op Ar count
@@ -306,7 +306,7 @@ NOTES
 
 .Sh ENVIRONMENT
 If the following environment variable exists, it is utilized by
-.Nm mt .
+.Nm .
 .Bl -tag -width Fl
 .It Ev TAPE
 .Nm Mt
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 5636440d0e56..6c04f04146f3 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -32,7 +32,7 @@
 .Nm ncal
 .Nd displays a calendar and the date of easter
 .Sh SYNOPSIS
-.Nm cal
+.Nm
 .Op Fl jy
 .Op Oo Ar month Oc Ar \ year
 .Nm ncal
@@ -102,7 +102,7 @@ A year starts on Jan 1.
 .Rs
 .Sh HISTORY
 A
-.Nm cal
+.Nm
 command appeared in
 .At v6 .
 The
diff --git a/usr.bin/ncplist/ncplist.1 b/usr.bin/ncplist/ncplist.1
index 865f239c53c2..8ba6f53ceb81 100644
--- a/usr.bin/ncplist/ncplist.1
+++ b/usr.bin/ncplist/ncplist.1
@@ -6,7 +6,7 @@
 .Nm ncplist
 .Nd Displays various information about ncplib and NetWare servers
 .Sh SYNOPSIS
-.Nm ncplist
+.Nm
 .Ar command
 .Op Ar args
 .Sh DESCRIPTION
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index ba0ceccaf19d..3be43552070f 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -6,7 +6,7 @@
 .Nm ncplogin
 .Nd create permanent connection to a NetWare server
 .Sh SYNOPSIS
-.Nm ncplogin
+.Nm
 .Op Fl BCDN
 .Op Fl S Ar server
 .Op Fl U Ar user
@@ -22,7 +22,7 @@
 .Op Fl R Ar retrycount
 .Op Fl T Ar tree
 .Op Fl W Ar timeout
-.Nm ncplogin
+.Nm
 .Op Fl BCDN
 .Op Fl A Ar host
 .Op Fl I Ar level
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index 07aeb5309ff9..e2b4c633c71a 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -6,11 +6,11 @@
 .Nm ncplogout
 .Nd schedule permanent connection to close
 .Sh SYNOPSIS
-.Nm ncplogout
+.Nm
 .Op -S Ar server
 .Op -U Ar user
 .Op -c Ar handle
-.Nm ncplogout
+.Nm
 .Op -c Ar handle
 .No / Ns Ar server Ns : Ns Ar user
 .Sh DESCRIPTION
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index c86b262d68d5..879017250894 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -39,38 +39,38 @@
 .Nm netstat
 .Nd show network status
 .Sh SYNOPSIS
-.Nm netstat
+.Nm
 .Op Fl AaLln
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Nm netstat
+.Nm
 .Op Fl bdghilmnrs
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Nm netstat
+.Nm
 .Op Fl bdn
 .Op Fl I Ar interface
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl w Ar wait
-.Nm netstat
+.Nm
 .Op Fl p Ar protocol
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Nm netstat
+.Nm
 .Op Fl p Ar protocol
 .Op Fl i
 .Op Fl I Ar Interface
-.Nm netstat
+.Nm
 .Op Fl s
 .Op Fl f Ar address_family
 .Op Fl i
 .Op Fl I Ar Interface
 .Sh DESCRIPTION
 The
-.Nm netstat
+.Nm
 command symbolically displays the contents of various network-related
 data structures.
 There are a number of output formats,
@@ -82,7 +82,7 @@ data structures according to the option selected.
 Using the third form, with a
 .Ar wait
 interval specified,
-.Nm netstat
+.Nm
 will continuously display the information regarding packet
 traffic on the configured network interfaces.
 The fourth form displays statistics about the named protocol.
@@ -217,7 +217,7 @@ Extract the name list from the specified system instead of the default
 .Pa /kernel .
 .It Fl n
 Show network addresses as numbers (normally
-.Nm netstat
+.Nm
 interprets addresses and attempts to display them
 symbolically).
 This option may be used with any of the display formats.
@@ -337,7 +337,7 @@ sent using that route.  The interface entry indicates the network
 interface utilized for the route.
 .Pp
 When
-.Nm netstat
+.Nm
 is invoked with the
 .Fl w
 option and a
@@ -366,7 +366,7 @@ option.
 .Xr vmstat 8
 .Sh HISTORY
 The
-.Nm netstat
+.Nm
 command appeared in
 .Bx 4.2 .
 .Pp
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index d17c9594a69e..1cbf9f29f32d 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -7,9 +7,9 @@
 .Nm newkey
 .Nd create a new key in the publickey database
 .Sh SYNOPSIS
-.Nm newkey
+.Nm
 .Fl h Ar hostname
-.Nm newkey
+.Nm
 .Fl u Ar username
 .Sh DESCRIPTION
 .Nm Newkey 
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 9bebdc15cf79..b23940642f0c 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -63,7 +63,7 @@ at priority
 .Ar number
 relative to the priority
 of 
-.Nm nice .
+.Nm .
 Higher priorities than the
 current process priority can only requested by the
 super-user. 
@@ -72,7 +72,7 @@ Negative numbers are expressed as
 .Pp
 The returned exit status is the exit value from the
 command executed by
-.Nm nice .
+.Nm .
 .Pp
 Some shells may provide a builtin
 .Nm
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index a674c60bd54a..d409c335c2af 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -79,7 +79,7 @@ Consult the
 manual page.
 .Sh ENVIRONMENT
 The following variable is utilized by
-.Nm Ns :
+.Nm :
 .Bl -tag -width flag
 .It Ev HOME
 If the output file
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 9fde70c17d69..027b12e51fbb 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -32,7 +32,7 @@
 .Nm objformat
 .Nd reports default binary format and program deflector
 .Sh SYNOPSIS
-.Nm objformat
+.Nm
 .Nm prog
 .Sh DESCRIPTION
 If run as
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index aac371d04db0..f76c3a7d20f8 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -39,7 +39,7 @@
 .Nm pagesize
 .Nd print system page size
 .Sh SYNOPSIS
-.Nm pagesize
+.Nm
 .Sh DESCRIPTION
 .Nm Pagesize
 prints the size of a page of memory in bytes, as
@@ -51,7 +51,7 @@ shell scripts.
 .Xr getpagesize 3
 .Sh HISTORY
 The
-.Nm pagesize
+.Nm
 command
 appeared in
 .Bx 4.2 .
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index a036a2cc179c..eb9fe3c960f6 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -36,10 +36,10 @@
 .Dt PASSWD 1
 .Os BSD 4
 .Sh NAME
-.Nm passwd, yppasswd
+.Nm passwd , yppasswd
 .Nd modify a user's password
 .Sh SYNOPSIS
-.Nm passwd
+.Nm
 .Op Fl l
 .Op Ar user
 .Nm yppasswd
@@ -52,13 +52,13 @@
 .Nm Passwd
 changes the user's local, Kerberos, or NIS password.  
 If the user is not the super-user,
-.Nm passwd
+.Nm
 first prompts for the current password and will not continue unless the correct
 password is entered.
 .Pp
 When entering the new password, the characters entered do not echo, in order to
 avoid the password being seen by a passer-by.  
-.Nm passwd
+.Nm
 prompts for the new password twice in order to detect typing errors.
 .Pp
 The new password should be at least six characters long (which
@@ -81,7 +81,7 @@ authenticate Windows clients.  In all other situations, numbers, upper
 case letters and meta characters are encouraged.
 .Pp
 Once the password has been verified,
-.Nm passwd
+.Nm
 communicates the new password information to
 the Kerberos authenticating host.
 .Bl -tag -width flag
@@ -110,14 +110,14 @@ if only the local password is modified.
 has built-in support for NIS.
 If a user exists in the NIS password
 database but does not exist locally,
-.Nm passwd
+.Nm
 automatically switches into 
 .Dq yppasswd
 mode.
 If the specified
 user does not exist in either the local password database of the
 NIS password maps,
-.Nm passwd
+.Nm
 returns an error.
 .Pp
 When changing an NIS password, unprivileged users are required to provide
@@ -140,14 +140,14 @@ The following additional options are supported for use with NIS:
 The
 .Fl y
 flag overrides
-.Nm passwd 's
+.Nm Ns 's
 checking heuristics and forces
 it into NIS mode.
 .It Fl l
 When NIS is enabled, the
 .Fl l
 flag can be used to force
-.Nm passwd
+.Nm
 into 
 .Dq local only
 mode.
@@ -162,7 +162,7 @@ or
 in both the NIS password maps and the local user database.
 By
 default,
-.Nm passwd
+.Nm
 will try to change the NIS password.
 The
 .Fl l
@@ -170,7 +170,7 @@ flag can be used to change the local password instead.
 .It Fl d Ar domain
 Specify what domain to use when changing an NIS password.
 By default,
-.Nm passwd
+.Nm
 assumes that the system default domain should be used.
 This flag is
 primarily for use by the superuser on the NIS master server: a single
@@ -178,7 +178,7 @@ NIS server can support multiple domains.
 It is also possible that the
 domainname on the NIS master may not be set (it is not necessary for
 an NIS server to also be a client) in which case the
-.Nm passwd
+.Nm
 command needs to be told what domain to operate on.
 .It Fl h Ar host
 Specify the name of an NIS server.
@@ -190,7 +190,7 @@ server.
 When a domain is specified with the
 .Fl d
 option and
-.Nm passwd
+.Nm
 is unable to determine the name of the NIS master server (possibly because
 the local domainname isn't set), the name of the NIS master is assumed to
 be 
@@ -241,9 +241,9 @@ configure authentication services
 The
 .Xr yppasswd 1
 command is really only a link to
-.Nm passwd .
+.Nm .
 .Sh HISTORY
 A
-.Nm passwd
+.Nm
 command appeared in
 .At v6 .
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index a4d2d9b044a5..3e50e7ad8468 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -41,7 +41,7 @@
 .Nm printenv , env
 .Nd print out the environment, set and print environment
 .Sh SYNOPSIS
-.Nm printenv
+.Nm
 .Op Ar name
 .Nm env
 .Op Fl
@@ -59,7 +59,7 @@ its value is printed.
 If a
 .Ar name
 is specified and it is not defined in the environment,
-.Nm printenv
+.Nm
 returns exit status 1, else it returns status 0.
 .Pp
 Some shells may provide a builtin
@@ -108,7 +108,7 @@ of the variables in the environment, with one name/value pair per line.
 .Xr environ 7
 .Sh HISTORY
 The
-.Nm printenv
+.Nm
 command appeared in
 .Bx 3.0 .
 .Sh BUGS
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index c500e5471a6a..4cd6d2bfb246 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -42,15 +42,15 @@
 .Nm quota
 .Nd display disk usage and limits
 .Sh SYNOPSIS
-.Nm quota
+.Nm
 .Op Fl g
 .Op Fl u
 .Op Fl v | Fl q
-.Nm quota
+.Nm
 .Op Fl u
 .Op Fl v | Fl q
 .Ar user
-.Nm quota
+.Nm
 .Op Fl g
 .Op Fl v | Fl q
 .Ar group
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index f789b1dc970a..902a7f93bbee 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -46,7 +46,7 @@
 .Op Fl d Ar var=value
 .Op Fl m Ar host
 .Op Ar name ...
-.Nm rdist
+.Nm
 .Op Fl nqbRhivwyD
 .Op Fl P Ar rshcmd
 .Fl c
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 09ddf5bb9fbd..2a55603f5f4b 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -39,7 +39,7 @@
 .Nm renice
 .Nd alter priority of running processes
 .Sh SYNOPSIS
-.Nm renice
+.Nm
 .Ar priority
 .Oo
 .Op Fl p
@@ -71,7 +71,7 @@ By default, the processes to be affected are specified by
 their process ID's.
 .Pp
 Options supported by
-.Nm renice :
+.Nm :
 .Bl -tag -width Ds
 .It Fl g
 Force 
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index 5f15501512b3..d8775c14b2f7 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -39,11 +39,11 @@
 .Nm rev
 .Nd reverse lines of a file
 .Sh SYNOPSIS
-.Nm rev
+.Nm
 .Op Ar file ...
 .Sh DESCRIPTION
 The
-.Nm rev
+.Nm
 utility copies the specified files to the standard output, reversing the
 order of characters in every line.
 If no files are specified, the standard input is read.
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index ec647d522559..b3377442b442 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -191,7 +191,7 @@ standard Berkeley
 is used instead.
 .Sh ENVIRONMENT
 The following environment variable is utilized by
-.Nm Ns :
+.Nm :
 .Bl -tag -width TERM
 .It Ev TERM
 Determines the user's terminal type.
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index d31648d9e99e..d8ecd96c0aa5 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -8,9 +8,9 @@
 .Nm rpcgen
 .Nd an RPC protocol compiler
 .Sh SYNOPSIS
-.Nm rpcgen
+.Nm
 .Ar infile
-.Nm rpcgen
+.Nm
 .Op Fl a
 .Op Fl b
 .Op Fl C
@@ -25,7 +25,7 @@
 .Op Fl T
 .Op Fl Y Ar pathname
 .Ar infile
-.Nm rpcgen
+.Nm
 .Oo
 .Fl c |
 .Fl h |
@@ -38,11 +38,11 @@
 .Oc
 .Op Fl o Ar outfile
 .Op Ar infile
-.Nm rpcgen
+.Nm
 .Op Fl s Ar nettype
 .Op Fl o Ar outfile
 .Op Ar infile
-.Nm rpcgen
+.Nm
 .Op Fl n Ar netid
 .Op Fl o Ar outfile
 .Op Ar infile
@@ -193,7 +193,7 @@ accepts the standard input.
 The C preprocessor,
 .Em cc -E
 is run on the input file before it is actually interpreted by
-.Nm Ns .
+.Nm .
 For each type of output file,
 .Nm
 defines a special preprocessor symbol for use by the
@@ -216,7 +216,7 @@ Any line beginning with
 .Dq %
 is passed directly into the output file,
 uninterpreted by
-.Nm Ns .
+.Nm .
 To specify the path name of the C preprocessor use
 .Fl Y
 flag.
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index e3fb914fcd09..38da63093815 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -8,23 +8,23 @@
 .Nm rpcinfo
 .Nd report RPC information
 .Sh SYNOPSIS
-.Nm rpcinfo
+.Nm
 .Fl p
 .Op Ar host
-.Nm rpcinfo
+.Nm
 .Op Fl n Ar portnum
 .Fl u Ar host
 .Ar program
 .Op Ar version
-.Nm rpcinfo
+.Nm
 .Op Fl n Ar portnum
 .Fl t Ar host 
 .Ar program
 .Op Ar version
-.Nm rpcinfo
+.Nm
 .Fl b
 .Ar program version
-.Nm rpcinfo
+.Nm
 .Fl d
 .Ar program version
 .Sh DESCRIPTION
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index d21bde35448e..f392f9737c13 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -39,7 +39,7 @@
 .Nm rs
 .Nd reshape a data array
 .Sh SYNOPSIS
-.Nm rs
+.Nm
 .Oo
 .Fl Op csCS
 .Op Ar x
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 2f7761604eac..a66e73bfc4da 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -178,7 +178,7 @@ You cannot run an interactive command
 or
 .Xr vi 1 )
 using
-.Nm Ns ;
+.Nm ;
 use
 .Xr rlogin 1
 instead.
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 98458bbe8e08..de37cdc6da3d 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -39,7 +39,7 @@
 .Nm ruptime
 .Nd show host status of local machines
 .Sh SYNOPSIS
-.Nm ruptime
+.Nm
 .Op Fl alrtu
 .Sh DESCRIPTION
 .Nm Ruptime
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 52075b2050e5..b268c798afe4 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -39,7 +39,7 @@
 .Nm rusers
 .Nd who is logged in to machines on local network
 .Sh SYNOPSIS
-.Nm rusers
+.Nm
 .Op Fl al
 .Op Ar host ...
 .Sh DESCRIPTION
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index e6486d39a8ff..14760ee6167c 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -113,7 +113,7 @@ works best with commands that do not manipulate the screen.
 The results are meant to emulate a hardcopy terminal, not an addressable one.
 .Sh ENVIRONMENT
 The following environment variable is utilized by
-.Nm script :
+.Nm :
 .Bl -tag -width SHELL
 .It Ev SHELL
 If the variable
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 90efe4ac1b71..e24ff954a6ef 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -42,11 +42,11 @@
 .Nm sed
 .Nd stream editor
 .Sh SYNOPSIS
-.Nm sed
+.Nm
 .Op Fl Ean
 .Ar command
 .Op Ar file ...
-.Nm sed
+.Nm
 .Op Fl Ean
 .Op Fl e Ar command
 .Op Fl f Ar command_file
@@ -59,7 +59,7 @@ are specified, modifying the input as specified by a list of commands.
 The input is then written to the standard output.
 .Pp
 A single command may be specified as the first argument to
-.Nm Ns .
+.Nm .
 Multiple commands may be specified by using the
 .Fl e
 or
@@ -167,7 +167,7 @@ of the exclamation character
 function.
 .Sh "Sed Regular Expressions"
 The regular expressions used in
-.Nm sed ,
+.Nm ,
 by default, are basic regular expressions (BREs, see
 .Xr re_format 7
 for more information).
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 901c2324c1cd..2aa4db8c4b02 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -42,7 +42,7 @@
 .Nm showmount
 .Nd show remote nfs mounts on host
 .Sh SYNOPSIS
-.Nm showmount
+.Nm
 .Op Fl ade3
 .Op Ar host
 .Sh DESCRIPTION
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index 1cd1f9f7bec7..96be1c5f0a73 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -39,7 +39,7 @@
 .Nm size
 .Nd display object file segment sizes (text, data and bss)
 .Sh SYNOPSIS
-.Nm size
+.Nm
 .Op Ar object_file ...
 .Sh DESCRIPTION
 .Nm Size
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 3df468538eb6..631e62427d9b 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -39,14 +39,14 @@
 .Nm split
 .Nd split a file into pieces
 .Sh SYNOPSIS
-.Nm split
+.Nm
 .Op Fl b Ar byte_count[k|m]
 .Op Fl l Ar line_count
 .Op Fl p Ar pattern
 .Op Ar file Op Ar name
 .Sh DESCRIPTION
 The
-.Nm split
+.Nm
 utility reads the given
 .Ar file
 (or standard input if no file is specified)
@@ -100,7 +100,7 @@ files named in the range of
 .Sh BUGS
 For historical reasons, if you specify
 .Ar name ,
-.Nm split
+.Nm
 can only create 676 separate
 files.
 The default naming convention allows 2028 separate files.
@@ -110,6 +110,6 @@ The maximum line length for matching patterns is 65536.
 .Xr re_format 7
 .Sh HISTORY
 A
-.Nm split
+.Nm
 command appeared in
 .At v6 .
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index f245e888e906..2be438524a3d 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -78,7 +78,7 @@ is set to the target login, unless the target login has a user ID of 0,
 in which case it is unmodified.
 The invoked shell is the target login's.
 This is the traditional behavior of
-.Nm su .
+.Nm .
 Resource limits and session priority applicable to the original user's
 login class (See
 .Xr login.conf 5 )
@@ -186,7 +186,7 @@ configure authentication services
 .Xr environ 7
 .Sh ENVIRONMENT
 Environment variables used by
-.Nm su :
+.Nm :
 .Bl -tag -width HOME
 .It Ev HOME
 Default home directory of real user ID unless modified as
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 200035299b01..629e0c7c7a9a 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -107,7 +107,7 @@ specifies the screen refresh time interval in seconds.
 .El
 .Pp
 Certain characters cause immediate action by
-.Nm systat  .
+.Nm .
 These are
 .Bl -tag -width Fl
 .It Ic \&^L
@@ -117,7 +117,7 @@ Print the name of the current ``display'' being shown in
 the lower window and the refresh interval.
 .It Ic \&^Z
 Stop
-.Nm systat  .
+.Nm .
 .It Ic \&:
 Move the cursor to the command line and interpret the input
 line typed as a command.  While entering a command the
@@ -146,7 +146,7 @@ Supplying only a number will set the refresh interval to this
 value.
 .It Ic quit
 Exit
-.Nm systat  .
+.Nm .
 (This may be abbreviated to
 .Ic q  . )
 .El
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index de4daf216433..dc652c837228 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -166,7 +166,7 @@ The historic command line syntax of
 is supported by this implementation.
 The only difference between this implementation and historic versions
 of
-.Nm tail ,
+.Nm ,
 once the command line syntax translation has been done, is that the
 .Fl b ,
 .Fl c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 4e52e652597a..c2b7830de2f0 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -10,7 +10,7 @@
 .Nm captoinfo
 .Nd convert between termcap, terminfo source and terminfo binary
 .Sh SYNOPSIS
-.Nm tconv
+.Nm
 .Op Fl b
 .Op Fl c Op Fl OUGd
 .Op Fl i
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index bd0b238e7407..41e0a4315608 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -67,7 +67,7 @@ is invoked without the
 .Ar host
 argument, it enters command mode,
 indicated by its prompt
-.Pq Nm telnet\&> .
+.Pq Dq Li telnet\&> .
 In this mode, it accepts and executes the commands listed below.
 If it is invoked with arguments, it performs an
 .Ic open
@@ -606,7 +606,7 @@ command prompt.
 Close any open
 .Tn TELNET
 session and exit
-.Nm telnet  .
+.Nm .
 An end of file (in command mode) will also close a session and exit.
 .It Ic send Ar arguments 
 Sends one or more special character sequences to the remote host.
@@ -1084,7 +1084,7 @@ command.
 .El
 .It Ic status
 Show the current status of
-.Nm telnet  .
+.Nm .
 This includes the peer one is connected to, as well
 as the current mode.
 .It Ic toggle Ar arguments ... 
@@ -1351,7 +1351,7 @@ commands.
 .El
 .It Ic z
 Suspend
-.Nm telnet  .
+.Nm .
 This command only works when the user is using the
 .Xr csh  1  .
 .It Ic \&! Op Ar command 
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 0f87f58f39ce..15eab9898f50 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -60,7 +60,7 @@ command below).
 Once
 .Nm
 is running, it issues the prompt
-.Nm tftp>
+.Dq Li tftp>
 and recognizes the following commands:
 .Pp
 .Bl -tag -width verbose -compact
@@ -140,7 +140,7 @@ machine.
 .Pp
 .It Cm quit
 Exit
-.Nm tftp .
+.Nm .
 An end of file also exits.
 .Pp
 .It Cm rexmt Ar retransmission-timeout
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index 5fd486699ed5..ebe8cd0592eb 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -127,7 +127,7 @@ a reset and return to a ready condition.
 .Bl -tag -width /etc/modems -compact
 .It Pa /etc/modems
 The
-.Nm modems
+.Nm
 configuration database file
 resides in
 .Pa /etc .
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 35cf4ddb0e34..56d8092b1ec8 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -39,11 +39,11 @@
 .Nm tip
 .Nd connect to a remote system
 .Sh SYNOPSIS
-.Nm tip
+.Nm
 .Op Fl v
 .Fl Ns Ns Ar speed 
 .Ar system\-name
-.Nm tip
+.Nm
 .Op Fl v
 .Fl Ns Ns Ar speed 
 .Ar phone\-number
@@ -92,7 +92,7 @@ Send a file to a remote
 host.  The put command causes the remote
 .Ux
 system to run the command string ``cat > 'to''', while
-.Nm tip
+.Nm
 sends it the ``from''
 file.  If the ``to'' file isn't specified the ``from'' file name is used.
 This command is actually a
@@ -106,7 +106,7 @@ As in the put command the ``to'' file
 defaults to the ``from'' file name if it isn't specified.
 The remote host
 executes the command string ``cat 'from';echo ^A'' to send the file to
-.Nm tip  .
+.Nm .
 .It Ic \&~|
 Pipe the output from a remote command to a local
 .Ux
@@ -147,14 +147,14 @@ characters.
 Set a variable (see the discussion below).
 .It Ic \&~^Z
 Stop
-.Nm tip
+.Nm
 (only available with job control).
 .It Ic \&~^Y
 Stop only the ``local side'' of
-.Nm tip
+.Nm
 (only available with job control);
 the ``remote side'' of
-.Nm tip  ,
+.Nm ,
 the side that displays output from the remote host, is left running.
 .It Ic \&~?
 Get a summary of the tilde escapes
@@ -175,7 +175,7 @@ to be used may be specified on the command line, e.g.
 .Ql "tip -300 mds" .
 .Pp
 When
-.Nm tip
+.Nm
 establishes a connection it sends out a
 connection message to the remote system; the default value, if any,
 is defined in
@@ -184,7 +184,7 @@ is defined in
 .Xr remote 5 ) .
 .Pp
 When
-.Nm tip
+.Nm
 prompts for an argument (e.g. during setup of
 a file transfer) the line typed may be edited with the standard
 erase and kill characters.  A null line in response to a prompt,
@@ -198,7 +198,7 @@ and by honoring the locking protocol used by
 .Xr uucico 8 .
 .Pp
 During file transfers
-.Nm tip
+.Nm
 provides a running count of the number of lines transferred.
 When using the ~> and ~< commands, the ``eofread'' and ``eofwrite''
 variables are used to recognize end-of-file when reading, and
@@ -206,12 +206,12 @@ specify end-of-file when writing (see below).  File transfers
 normally depend on tandem mode for flow control.  If the remote
 system does not support tandem mode, ``echocheck'' may be set
 to indicate
-.Nm tip
+.Nm
 should synchronize with the remote system on the echo of each
 transmitted character.
 .Pp
 When
-.Nm tip
+.Nm
 must dial a phone number to connect to a system it will print
 various messages indicating its actions.
 .Nm Tip
@@ -253,7 +253,7 @@ Variables may be initialized at run time by placing set commands
 in one's home directory).  The
 .Fl v
 option causes
-.Nm tip
+.Nm
 to display the sets as they are made.
 Certain common variables have abbreviations.
 The following is a list of common variables,
@@ -344,7 +344,7 @@ default value is
 .Ar off  .
 When this mode is enabled, all lower case letters will be mapped to
 upper case by
-.Nm tip
+.Nm
 for transmission to the remote machine.
 .It Ar raisechar
 (char) The input character used to toggle upper case mapping mode;
@@ -365,7 +365,7 @@ When
 .Ar script
 is
 .Li true  ,
-.Nm tip
+.Nm
 will record everything transmitted by the remote machine in
 the script record file specified in
 .Ar record  .
@@ -391,7 +391,7 @@ Each tab is expanded to 8 spaces.
 default is
 .Ar true  .
 When verbose mode is enabled,
-.Nm tip
+.Nm
 prints messages while dialing, shows the current number
 of lines transferred during a file transfer operations,
 and more.
@@ -445,7 +445,7 @@ Diagnostics are, hopefully, self explanatory.
 .Xr remote 5
 .Sh HISTORY
 The
-.Nm tip
+.Nm
 appeared command in
 .Bx 4.2 .
 .Sh BUGS
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index ba5b0c800265..b1224281acfd 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -131,7 +131,7 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr utimes 2
 .Sh COMPATIBILITY
 The obsolescent form of
-.Nm touch ,
+.Nm ,
 where a time format is specified as the first argument, is supported.
 When no
 .Fl r
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 69dde037a9ef..bffd8711f8db 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -42,18 +42,18 @@
 .Nm tr
 .Nd translate characters
 .Sh SYNOPSIS
-.Nm tr
+.Nm
 .Op Fl csu
 .Ar string1 string2
-.Nm tr
+.Nm
 .Op Fl cu
 .Fl d
 .Ar string1
-.Nm tr
+.Nm
 .Op Fl cu
 .Fl s
 .Ar string1
-.Nm tr
+.Nm
 .Op Fl cu
 .Fl ds
 .Ar string1 string2
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index dc2b69cf4807..efb39bdd3dfb 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -32,7 +32,7 @@
 .Nm truncate 
 .Nd truncate or extend the length of files
 .Sh SYNOPSIS
-.Nm truncate
+.Nm
 .Op Fl c
 .Bk -words
 .Fl s Xo
@@ -44,7 +44,7 @@
 .Xc
 .Ek
 .Ar
-.Nm truncate
+.Nm
 .Op Fl c
 .Bk -words
 .Fl r Ar rfile
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index c984751ba526..667070d8be12 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -7,11 +7,11 @@
 .Nm truss
 .Nd trace system calls
 .Sh SYNOPSIS
-.Nm truss
+.Nm
 .Op Fl S
 .Op Fl o Ar file
 .Fl p Ar pid
-.Nm truss
+.Nm
 .Op Fl S
 .Op Fl o Ar file
 command
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 0ecce119a252..c7e87d264393 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -40,7 +40,7 @@
 .Nm reset
 .Nd terminal initialization
 .Sh SYNOPSIS
-.Nm tset
+.Nm
 .Op Fl IQrSs
 .Op Fl
 .Op Fl e Ar ch
diff --git a/usr.bin/uac/uac.1 b/usr.bin/uac/uac.1
index feee726d6bf9..cc740666b7d2 100644
--- a/usr.bin/uac/uac.1
+++ b/usr.bin/uac/uac.1
@@ -31,7 +31,7 @@
 .Nm uac
 .Nd Unaligned Access Message Control
 .Sh SYNOPSIS
-.Nm uac
+.Nm
 .Op Fl fprs
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 470fea1450a2..c22fea410f6a 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -39,7 +39,7 @@
 .Nm ul
 .Nd do underlining
 .Sh SYNOPSIS
-.Nm ul
+.Nm
 .Op Fl i
 .Op Fl t Ar terminal
 .Op Ar name Ar ...
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 26edefcdc2a3..50c207ee4c48 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -42,7 +42,7 @@
 .Nm unifdef
 .Nd remove ifdef'ed lines
 .Sh SYNOPSIS
-.Nm unifdef
+.Nm
 .Op Fl clt
 .Oo
 .Fl D Ns Ar sym
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index a01f18b2ff0c..9e2ffccc6d9b 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -40,7 +40,7 @@
 .Nm uudecode
 .Nd encode/decode a binary file
 .Sh SYNOPSIS
-.Nm uuencode
+.Nm
 .Op Ar file
 .Ar name
 .Nm uudecode
@@ -138,6 +138,6 @@ control information).
 The
 .Nm uudecode
 and
-.Nm uuencode
+.Nm
 utilities appeared in
 .Bx 4.0 .
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index d256a0b1b164..e3caa39db8d1 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -100,7 +100,7 @@ on a line by itself.
 .Xr uuencode 1
 .Sh HISTORY
 The
-.Nm uuencode
+.Nm
 file format appeared in
 .Bx 4.0 .
 .\" It was named uuencode.5 prior to 4.3
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 105442b80b45..cb78085069cd 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -40,10 +40,10 @@
 .Nd language definition data base for
 .Xr vgrind 1
 .Sh SYNOPSIS
-.Nm vgrindefs
+.Nm
 .Sh DESCRIPTION
 The
-.Nm vgrindefs
+.Nm
 file
 contains all language definitions for
 .Xr vgrind 1 .
@@ -102,7 +102,7 @@ as "c" or "C".
 Entries may continue onto multiple lines by giving a \e as the last
 character of a line.
 Capabilities in
-.Nm vgrindefs
+.Nm
 are of two types:
 Boolean capabilities which indicate that the language has
 some particular feature
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 860628e88693..9df1e94c15e6 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -39,7 +39,7 @@
 .Nm vmstat
 .Nd report virtual memory statistics
 .Sh SYNOPSIS
-.Nm vmstat
+.Nm
 .\" .Op Fl fimst
 .Op Fl imsz
 .Op Fl c Ar count
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 12f3da808c13..ffd692d28c35 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -39,7 +39,7 @@
 .Nm w
 .Nd "display who is logged in and what they are doing"
 .Sh SYNOPSIS
-.Nm w
+.Nm
 .Op Fl dhin
 .Op Fl M Ar core
 .Op Fl N Ar system
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 73f928036640..1ba23d553a52 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -39,7 +39,7 @@
 .Nm wall
 .Nd write a message to users
 .Sh SYNOPSIS
-.Nm wall
+.Nm
 .Op Ar file
 .Sh DESCRIPTION
 .Nm Wall
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 388862b01a63..7c81926f68cd 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -42,7 +42,7 @@
 .Nm wc
 .Nd word, line, and byte count
 .Sh SYNOPSIS
-.Nm wc
+.Nm
 .Op Fl clw
 .Op Ar
 .Sh DESCRIPTION
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 46817fdab624..89341c1febb1 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -40,14 +40,14 @@
 .Nm whereis
 .Nd locate programs
 .Sh SYNOPSIS
-.Nm whereis
+.Nm
 .Op Fl bms
 .Op Fl u
 .Op Fl BMS dir ... Fl f
 .Ar program ...
 .Sh DESCRIPTION
 The
-.Nm whereis
+.Nm
 utility checks the standard binary, manual page, and source
 directories for the specified programs, printing out the paths of any
 it finds.  The supplied names are first stripped of leading path name
@@ -133,7 +133,7 @@ might take some time, and will only succeed if the locate database is
 up-to-date.
 .Sh HISTORY
 The
-.Nm whereis
+.Nm
 command appeared in
 .Bx 3.0 .
 This version re-implements the historical
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index a8048ac85179..932a76a11d7d 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -35,7 +35,7 @@
 .Nm which
 .Nd "locate a program file in the user's path"
 .Sh SYNOPSIS
-.Nm which
+.Nm
 .Op Fl as
 .Op Ar command
 .Ar ...
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 6352eab33d8c..6d0ec8e0f111 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -39,9 +39,9 @@
 .Nm who
 .Nd display who is logged in
 .Sh SYNOPSIS
-.Nm who
+.Nm
 .Ar am I
-.Nm who
+.Nm
 .Op Ar file 
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index d0ab40982696..7e9263edad21 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -39,7 +39,7 @@
 .Nm whois
 .Nd Internet domain name and network number directory service
 .Sh SYNOPSIS
-.Nm whois
+.Nm
 .Op Fl adgimpQrR6
 .Op Fl h Ar host
 .Ar name ...
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 5070cfb8bb3a..a4b95ce21626 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -42,7 +42,7 @@
 .Nm window
 .Nd window environment
 .Sh SYNOPSIS
-.Nm window
+.Nm
 .Op Fl t
 .Op Fl f
 .Op Fl d
@@ -66,7 +66,7 @@ input from the keyboard, but all windows can simultaneously send output
 to the display.
 .Pp
 When
-.Nm window
+.Nm
 starts up, the commands (see long commands below)
 contained in the file
 .Pa .windowrc
@@ -158,7 +158,7 @@ uses
 this information to redraw its display.
 .Ss Operation
 During normal execution,
-.Nm window
+.Nm
 can be in one of two states:
 conversation mode and command mode.  In conversation mode, the
 terminal's real cursor is placed at the cursor position of a particular
@@ -168,13 +168,13 @@ on top of all other windows, except those in foreground.  In addition,
 it is set apart by highlighting its identifier and label in reverse video.
 .Pp
 Typing
-.Nm window Ns 's 
+.Nm Ns 's
 escape character (normally
 .Ic ^P )
 in conversation
 mode switches it into command mode.  In command mode, the top line of
 the terminal screen becomes the command prompt window, and
-.Nm window
+.Nm
 interprets input from the keyboard as commands to manipulate windows.
 .Pp
 There are two types of commands: short commands are usually one or two
@@ -224,7 +224,7 @@ current window.  Thus, typing two
 .Ic ^P Ns 's
 in conversation
 mode sends one to the current window.  If the
-.Nm window
+.Nm
 escape is changed to some other character, that
 character takes the place of
 .Ic ^P
@@ -235,11 +235,11 @@ List a short summary of commands.
 Refresh the screen.
 .It Ic q
 Exit
-.Nm window  .
+.Nm .
 Confirmation is requested.
 .It Ic ^Z
 Suspend
-.Nm window  .
+.Nm .
 .It Ic w
 Create a new window.  The user is prompted for the positions
 of the upper left and lower right corners of the window.
@@ -394,7 +394,7 @@ be repeated any number of times.
 must be numeric.
 .Ss Expressions
 Expressions in
-.Nm window
+.Nm
 are similar to those in the
 C language, with most C operators supported on numeric
 operands.  In addition, some are overloaded to operate on strings.
@@ -580,7 +580,7 @@ Function call.
 .Aq Va Expr
 must be a string that is the unique
 prefix of the name of a builtin
-.Nm window
+.Nm
 function
 or the full name of a user defined alias macro.  In the case of a builtin
 function,
@@ -694,7 +694,7 @@ Set the default value of the
 .Ar smooth
 argument
 to the command
-.Nm window
+.Nm
 (see below).  The argument
 is a boolean flag (one of
 .Ar on  ,
@@ -714,7 +714,7 @@ The initial value is 1 (true).
 Write the list of strings,
 .Aq Ar string-list ,
 to
-.Nm window  ,
+.Nm ,
 separated
 by spaces and terminated with a new line.  The strings are only
 displayed in the window, the processes in the window are not
@@ -739,12 +739,12 @@ meaning
 .Bq Ar flag ) 
 .Xc
 Move
-.Nm window
+.Nm
 in or out of foreground.
 .Ar Flag
 is a boolean value.  The old foreground flag
 is returned.  Default for
-.Nm window
+.Nm
 is the current window,
 default for
 .Ar flag
@@ -754,12 +754,12 @@ is no change.
 .Bq Ar label ) 
 .Xc
 Set the label of
-.Nm window
+.Nm
 to
 .Ar label  .
 Returns the old
 label as a string.  Default for
-.Nm window
+.Nm
 is the current
 window, default for
 .Ar label
@@ -770,7 +770,7 @@ No arguments.  List the identifiers and labels of all windows.  No
 value is returned.
 .It Ic select Ns Pq Bq Ar window
 Make
-.Nm window
+.Nm
 the current window.  The previous current window
 is returned.  Default is no change.
 .It Ic source Ns Pq Ar filename
@@ -879,7 +879,7 @@ is returned as a number.
 Send the list of strings,
 .Aq Ar string-list ,
 to
-.Nm window  ,
+.Nm ,
 separated
 by spaces but not terminated with a new line.  The strings are actually
 given to the window as input.  No value is returned.  Default
@@ -888,7 +888,7 @@ is the current window.
 .Ss Predefined Variables
 These variables are for information only.  Redefining them does
 not affect the internal operation of
-.Nm window  .
+.Nm .
 .Bl -tag -width modes
 .It Ar baud
 The baud rate as a number between 50 and 38400.
@@ -941,7 +941,7 @@ pseudo-terminal devices.
 .El
 .Sh HISTORY
 The
-.Nm window
+.Nm
 command appeared in
 .Bx 4.3 .
 .Sh DIAGNOSTICS
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 2b9490209418..464d4a1989c3 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -42,7 +42,7 @@
 .Nm write
 .Nd send a message to another user
 .Sh SYNOPSIS
-.Nm write
+.Nm
 .Ar user
 .Op Ar ttyname
 .Sh DESCRIPTION
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 72c9cff0149e..3a4134ce8fd3 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -43,7 +43,7 @@
 .Nm xargs
 .Nd "construct argument list(s) and execute utility"
 .Sh SYNOPSIS
-.Nm xargs
+.Nm
 .Op Fl 0
 .Op Fl t
 .Oo Op Fl x
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 941577788a89..98670df74e51 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -39,14 +39,14 @@
 .Nm install
 .Nd install binaries
 .Sh SYNOPSIS
-.Nm install
+.Nm
 .Op Fl CcDMpsv
 .Op Fl f Ar flags
 .Op Fl g Ar group
 .Op Fl m Ar mode
 .Op Fl o Ar owner
 .Ar file1 file2
-.Nm install
+.Nm
 .Op Fl CcDMpsv
 .Op Fl f Ar flags
 .Op Fl g Ar group
@@ -55,7 +55,7 @@
 .Ar file1
 \&...
 .Ar fileN directory
-.Nm install
+.Nm
 .Fl d
 .Op Fl v
 .Op Fl g Ar group
@@ -85,7 +85,7 @@ then don't change the modification time of the target.
 .It Fl c
 Copy the file.
 This flag turns off the default behavior of
-.Nm install
+.Nm
 where it deletes the original file after creating the target.
 .It Fl D
 Print debugging information.
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 21361645bd69..35400bb6148b 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -38,7 +38,7 @@
 .Nm lint
 .Nd a C program verifier.
 .Sh SYNOPSIS
-.Nm lint
+.Nm
 .Op Fl abceghprvxzHFV
 .Op Fl s Ns | Ns Fl t
 .Op Fl i Ns | Ns Fl nu
@@ -49,7 +49,7 @@
 .Op Fl l Ns Ar library
 .Op Fl o Ns Ar outputfile
 .Ar
-.Nm lint
+.Nm
 .Op Fl abceghprvzHFV
 .Op Fl s Ns | Ns Fl t
 .Fl C Ns Ar library
@@ -70,10 +70,10 @@ preprocessor symbol
 .Sy lint
 defined to allow certain questionable code to be altered
 or skipped by
-.Nm lint .
+.Nm .
 Therefore, this symbol should be thought of as a reserved
 word for all code that is to be checked by
-.Nm lint .
+.Nm .
 .Pp
 Among the possible problems that are currently noted are
 unreachable statements, loops not entered at the top,
@@ -95,7 +95,7 @@ Filename arguments with
 names ending with
 .Pa \&.ln
 are taken to be the result of an earlier invocation of
-.Nm lint ,
+.Nm ,
 with either the
 .Fl i ,
 .Fl o
@@ -217,7 +217,7 @@ file on the command line.
 These
 .Pa \&.ln
 files are the product of
-.Nm lint Ns 's
+.Nm Ns 's
 first pass only, and are not checked for compatibility
 between functions.
 .It Fl n
@@ -325,7 +325,7 @@ followed by a question mark.
 Name the output file
 .Ar outputfile .
 The output file produced is the input that is given to
-.Nm lint Ns 's
+.Nm Ns 's
 second pass.
 The
 .Fl o
@@ -349,13 +349,13 @@ for the preprocessor.
 .It Fl V
 Print the command lines constructed by the controller program to
 run the C preprocessor and
-.Nm lint Ns 's
+.Nm Ns 's
 first and second pass.
 .El
 .Pp
 .Sy Input Grammar
 .Pp
-.Nm lint Ns 's
+.Nm Ns 's
 first pass reads standard C source files.
 .Nm
 recognizes the following C comments as commands.
@@ -474,7 +474,7 @@ file, and prints all messages that are about just that
 source file.
 After all the source files have been separately
 run through
-.Nm lint ,
+.Nm ,
 it is invoked once more (without the
 .Fl i
 option), listing all the
@@ -491,7 +491,7 @@ to be used to
 .Nm
 only the source files that have been modified since the last
 time the set of source files were
-.Nm lint Ns No ed .
+.Nm Ns No ed .
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev LIBDIR
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 777da20493b9..d7c142e475db 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -39,7 +39,7 @@
 .Nm xstr
 .Nd "extract strings from C programs to implement shared strings"
 .Sh SYNOPSIS
-.Nm xstr
+.Nm
 .Op Fl c
 .Op Fl 
 .Op Fl v
@@ -85,7 +85,7 @@ Verbose mode.
 After all components of a large program have been compiled a file
 .Pa xs.c
 declaring the common
-.Nm xstr
+.Nm
 space can be created by a command of the form
 .Bd -literal -offset indent
 xstr
@@ -119,7 +119,7 @@ after the C preprocessor if any macro definitions yield strings
 or if there is conditional code which contains strings
 which may not, in fact, be needed.
 An appropriate command sequence for running
-.Nm xstr
+.Nm
 after the C preprocessor is:
 .Pp
 .Bd -literal -offset indent -compact
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 2858ccd20b75..1ad336664a34 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -39,7 +39,7 @@
 .Nm yes
 .Nd be repetitively affirmative
 .Sh SYNOPSIS
-.Nm yes
+.Nm
 .Op Ar expletive
 .Sh DESCRIPTION
 .Nm Yes
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 139b2c6e5799..55fd45edf424 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -35,11 +35,11 @@
 .Nm ypcat
 .Nd "print the values of all keys in a YP database"
 .Sh SYNOPSIS
-.Nm ypcat
+.Nm
 .Op Fl kt
 .Op Fl d Ar domainname
 .Ar mapname
-.Nm ypcat 
+.Nm
 .Fl x
 .Sh DESCRIPTION
 .Nm Ypcat
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 6491407e942a..4d069ad500aa 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -35,12 +35,12 @@
 .Nm ypmatch
 .Nd "print the values of one or more keys in a YP database"
 .Sh SYNOPSIS
-.Nm ypmatch
+.Nm
 .Op Fl kt
 .Op Fl d Ar domainname
 .Ar key ...
 .Ar mapname
-.Nm ypmatch 
+.Nm
 .Fl x
 .Sh DESCRIPTION
 .Nm Ypmatch
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 88ca36d759ba..73f3c5c9317b 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -37,7 +37,7 @@
 .Nm ypwhich
 .Nd return hostname of YP server of map master
 .Sh SYNOPSIS
-.Nm ypwhich
+.Nm
 .Op Fl d Ar domain
 .Oo
 .Op Fl t
@@ -45,7 +45,7 @@
 |
 .Ar host
 .Oc
-.Nm ypwhich
+.Nm
 .Fl x
 .Sh DESCRIPTION
 .Nm Ypwhich
@@ -83,7 +83,7 @@ option.
 can be a map name or nickname.  If
 .Ar mname
 is omitted,
-.Nm ypwhich
+.Nm
 will produce a list of available maps.
 .It Fl x
 Display the map nickname table.