4 files changed, 29 insertions, 25 deletions

diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 74d4b2cc3e62..418725eb6683 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -36,7 +36,7 @@
 .Nm ld
 .Nd link editor
 .Sh SYNOPSIS
-.Nm ld
+.Nm
 .Op Fl fMNnrSstXxz
 .Bk -words
 .Op Fl A Ar symbol-file
@@ -63,7 +63,7 @@ combines the object and archive files given on the command line into a new
 object file. The output object file is either an executable program, a
 shared object suitable for loading at run-time, or an object file that can
 once again be processed by
-.Nm ld.
+.Nm .
 Object files and archives are processed in the order given on the command line.
 .Pp
 The options are as follows:
@@ -74,21 +74,21 @@ The the symbol-file is taken as a base for link-editing the object files
 on the command line.
 .It Fl assert Ar keyword
 This option is here mainly for compatibility with SunOS
-.Nm ld .
+.Nm .
 Most conditions which would cause a Sun assertion to fail will
 currently always cause error or warning messages from
-.Nm ld .
+.Nm .
 The only keyword implemented by
-.Nm ld
+.Nm
 is
-.Nm pure-text ,
+.Ar pure-text ,
 which generates a warning if a position independent object is being
 created and some of the files being linked are not position
 independent.
 .It Fl B Ns Ar dynamic
 Specifies that linking against dynamic libraries can take place. If a library
 specifier of the form -lx appears on the command line,
-.Nm ld
+.Nm
 searches for a library of the from libx.so.n.m
 .Po see the \&
 .Fl l
@@ -103,7 +103,7 @@ to
 This is similar to
 .Fl B Ns Ar dynamic
 except that if no dynamic libraries are linked against,
-.Nm ld
+.Nm
 will still produce a dynamic executable.  This is useful for programs
 which are static but still need to load dynamic objects at runtime.
 .It Fl B Ns Ar static
@@ -206,10 +206,11 @@ Specifies the name of the output file. Defaults to
 .It Fl Q
 Produce a
 .Dv QMAGIC
-(FreeBSD/BSDi-i386) output file.  This is the default.
+.Pq Fx Ns / Ns Tn BSDi Ns -i386
+output file.  This is the default.
 .It Fl r
 Produce relocatable object file, suitable for another pass through
-.Nm ld.
+.Nm .
 .It Fl R
 Record the given path within the executable for run-time library search.
 This only applies to dynamically linked executables.
@@ -272,7 +273,7 @@ options and preceding the built-in path.
 .Sh CAVEATS
 An entry point must now explicitly be given if the output is intended to be
 a normal executable program. This was not the case for the previous version of
-.Nm ld .
+.Nm .
 .Sh BUGS
 Shared objects are not properly checked for undefined symbols.
 .Pp
@@ -281,7 +282,7 @@ Cascading of shared object defeats the
 option.
 .Pp
 All shared objects presented to
-.Nm ld
+.Nm
 are marked for run-time loading in the output file, even if no symbols
 are needed from them.
 .Sh HISTORY
diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index 9167976345d5..376c39f62143 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -32,7 +32,7 @@
 .Nm catman
 .Nd preformat man pages
 .Sh SYNOPSIS
-.Nm catman
+.Nm
 .Op Fl f | Fl force
 .Op Fl h | Fl help
 .Op Fl L | Fl locale
@@ -123,7 +123,7 @@ to avoid redundant formatted man pages.
 .Xr manpath 1
 .Sh HISTORY
 This version of
-.Nm catman
+.Nm
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
index 81a6e1fb66b3..199d86124669 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
@@ -53,14 +53,14 @@ So use this wrapper for
 instead of calling makewhatis directly.
 .Nm catman.local
 is using for same purposes as
-.Nm makewhatis.local
+.Nm
 but for
 .Xr catman 1 .
 .Sh FILES
 .Bl -tag -width /etc/periodic/weekly/320.whatis.XXX -compact
 .It Pa /etc/periodic/weekly/320.whatis
 run
-.Nm makewhatis.local
+.Nm
 every week
 .It Pa /etc/periodic/weekly/330.catman
 run
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index 4ae542a49904..8903ae28385f 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -14,7 +14,7 @@
 .Nd
 tape archiver; manipulate "tar" archive files
 .Sh SYNOPSIS
-.Nm tar
+.Nm
 .Op [-] Ns Ar bundled-options Ar Args
 .Op Ar gnu-style-flags
 .Oo
@@ -122,7 +122,7 @@ below).
 .It Fl -help
 Prints a message listing and briefly describing all the command
 options to
-.Nm tar.
+.Nm .
 .It Fl -atime-preserve
 Restore the access times on files which are written to tape (note that
 this will change the inode-change time!).
@@ -273,7 +273,7 @@ Create archive with the given
 .Ar volume-name .
 .It Fl -version
 Print
-.Nm tar
+.Nm
 program version number.
 .It Fl w
 .It Fl -interactive
@@ -377,15 +377,15 @@ To specify the correct time zone use either e.g. `13:15 CEST' or `13:15+200'.
 
 .Sh ENVIRONMENT
 The
-.Nm tar
+.Nm
 program examines the following environment variables.
 .Bl -tag -width "POSIXLY_CORRECT"
 .It POSIXLY_CORRECT
 Normally,
-.Nm tar
+.Nm
 will process flag arguments that appear in the file list.
 If set in the environment, this causes
-.Nm tar
+.Nm
 to consider the first
 non-flag argument to terminate flag processing, as per the POSIX specification.
 .It SHELL
@@ -415,10 +415,11 @@ The default tape drive.
 .Sh HISTORY
 The tar format has a rich history, dating back to Sixth Edition UNIX.
 The current implementation of
-.Nm tar
+.Nm
 is the GNU implementation, which
 originated as the public-domain tar written by John Gilmore.
 .Sh AUTHORS
+.An -nosplit
 A cast of thousands, including [as listed in the ChangeLog file in the
 source]
 .An John Gilmore
@@ -433,8 +434,10 @@ source]
 and innumerable others who have contributed fixes and additions.
 .Pp
 Man page obtained by the
-.Bx Free
-group from the NetBSD 1.0 release.
+.Fx
+group from the
+.Nx 1.0
+release.
 .Sh BUGS
 The
 .Fl C