49 files changed, 198 insertions, 194 deletions

diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index f0e6b09832e1..ee446ae4084b 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -42,7 +42,7 @@
 .Nm cat
 .Nd concatenate and print files
 .Sh SYNOPSIS
-.Nm cat
+.Nm
 .Op Fl benstuv
 .Op Ar
 .Sh DESCRIPTION
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 2e32b96b058e..955df6530b9d 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -281,14 +281,17 @@ default changer device
 .Xr mt 1 ,
 .Xr mount 8 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 program and SCSI changer driver were written by
 .An Jason R. Thorpe Aq thorpej@and.com
-for And Communications, http://www.and.com/.
-.br
+for And Communications,
+.Pa http://www.and.com/ .
+.Pp
 Additional work by
 .An Hans Huebner
 .Aq hans@artcom.de
-and Steve Gunn
-.Aq csg@waterspout.com
+and
+.An Steve Gunn
+.Aq csg@waterspout.com .
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 847e1900fa08..edcf3a4af4c1 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -42,7 +42,7 @@
 .Nm chmod
 .Nd change file modes
 .Sh SYNOPSIS
-.Nm chmod
+.Nm
 .Oo
 .Fl f
 .Fl R
@@ -138,7 +138,9 @@ will run with effective gid set to the gid of the file owner.
 (the sticky bit)  
 When set on a directory, unprivileged users can delete and rename
 only those files in the directory that are owned by them, regardless of 
-the permissions on the directory.  Under FreeBSD, the sticky bit is 
+the permissions on the directory.  Under
+.Fx ,
+the sticky bit is 
 ignored for executable files and may only be set for directories (see 
 .Xr sticky 8 ).
 .It Li 0400
@@ -187,7 +189,6 @@ The
 .Ar who
 symbol ``a'' is equivalent to ``ugo''.
 .Pp
-.ne 1i
 The
 .Ar perm
 symbols represent the portions of the mode bits as follows:
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 54e050a50cef..5fa5116a496b 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -42,7 +42,7 @@
 .Nm cp
 .Nd copy files
 .Sh SYNOPSIS
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -50,7 +50,7 @@
 .Op Fl f | i
 .Op Fl pv
 .Ar source_file target_file
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
diff --git a/bin/date/date.1 b/bin/date/date.1
index f47312290b0a..5904a3bc6887 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -42,7 +42,7 @@
 .Nm date
 .Nd display or set date and time
 .Sh SYNOPSIS
-.Nm date
+.Nm
 .Op Fl jnu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
@@ -315,7 +315,7 @@ sets the time to
 without modifying the date.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width Ds
 .It Ev TZ
 The timezone to use when displaying dates.
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 24149f4c483e..f2a4a4a56dea 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -42,7 +42,7 @@
 .Nm dd
 .Nd convert and copy a file
 .Sh SYNOPSIS
-.Nm dd
+.Nm
 .Op operands ...
 .Sh DESCRIPTION
 The
@@ -251,7 +251,7 @@ will be positioned past the block in which the error occurred using
 Do not truncate the output file.
 This will preserve any blocks in the output file not explicitly written
 by
-.Nm Ns .
+.Nm .
 The
 .Cm notrunc
 value is not supported for tapes.
diff --git a/bin/df/df.1 b/bin/df/df.1
index 9660183b033e..7cf8f84713ad 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -39,7 +39,7 @@
 .Nm df
 .Nd display free disk space
 .Sh SYNOPSIS
-.Nm df
+.Nm
 .Oo
 .Fl b | h | H | k |
 .Fl m | P
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 96e4f076fdf6..9254c765a85b 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -39,7 +39,7 @@
 .Nm domainname
 .Nd set or print name of current YP/NIS domain
 .Sh SYNOPSIS
-.Nm domainname
+.Nm
 .Op Ar ypdomain
 .Sh DESCRIPTION
 .Nm Domainname
@@ -60,6 +60,6 @@ convenience.
 The
 .Nm 
 command appeared in
-.Tn FreeBSD
+.Fx
 1.1, based on a similar command in
 .Tn SunOS .
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 0f43f9955377..a5a16742125d 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -42,7 +42,7 @@
 .Nm echo
 .Nd write arguments to the standard output
 .Sh SYNOPSIS
-.Nm echo
+.Nm
 .Op Fl n
 .Op "string ..."
 .Sh DESCRIPTION
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 8f71b36201da..5d2567e710b2 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -8,7 +8,7 @@
 .Nm red
 .Nd text editor
 .Sh SYNOPSIS
-.Nm ed
+.Nm
 .Op Fl
 .Op Fl sx
 .Op Fl p Ar string
@@ -35,7 +35,7 @@ Changes are made to this copy and not directly to
 .Ar file
 itself.
 Upon quitting
-.Nm Ns ,
+.Nm ,
 any changes not explicitly saved  with a
 .Em w
 command are lost.
@@ -310,11 +310,11 @@ The following literal expressions can also be used in
 .Em char-class
 to specify sets of characters:
 .Pp
-\ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
-.PD 0
-\ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
-.PD 0
-\ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
+.Bl -column "[:alnum:]" "[:cntrl:]" "[:lower:]" "[:xdigit:]" -compact
+.It [:alnum:] Ta [:cntrl:] Ta [:lower:] Ta [:space:]
+.It [:alpha:] Ta [:digit:] Ta [:print:] Ta [:upper:]
+.It [:blank:] Ta [:graph:] Ta [:punct:] Ta [:xdigit:]
+.El
 .Pp
 If `-' appears as the first or last
 character of
@@ -328,12 +328,16 @@ Patterns in
 .Em char-class
 of the form:
 .Pp
-\ \ [.\fIcol-elm\fR.] or,
-.PD 0
-\ \ [=\fIcol-elm\fR=]
+.Bl -item -compact -offset 2n
+.It
+.Op \&. Ns Ar col-elm Ns \&.
+or,
+.It
+.Op = Ns Ar col-elm Ns =
+.El
 .Pp
 where
-.Em col-elm
+.Ar col-elm
 is a
 .Em collating element
 are interpreted according to
@@ -601,7 +605,7 @@ Unless a prompt was specified by with command-line option
 the command prompt is by default turned off.
 .It q
 Quit
-.Nm Ns .
+.Nm .
 .It Q
 Quit
 .Nm
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 85a0c8ebf601..defd8a488d80 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -37,7 +37,7 @@
 .Nm expr
 .Nd evaluate expression
 .Sh SYNOPSIS
-.Nm expr
+.Nm
 .Ar expression
 .Sh DESCRIPTION
 The
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index ebadd2e341d1..ed7f27c4d457 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -39,7 +39,7 @@
 .Nm hostname
 .Nd set or print name of current host system
 .Sh SYNOPSIS
-.Nm hostname
+.Nm
 .Op Fl s
 .Op Ar name-of-host
 .Sh DESCRIPTION
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 1a6d0f734f3c..6e3a1261672f 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -42,18 +42,18 @@
 .Nm kill
 .Nd terminate or signal a process
 .Sh SYNOPSIS
-.Nm kill
+.Nm
 .Op Fl s Ar signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl l
 .Op Ar exit_status
-.Nm kill
+.Nm
 .Fl signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl signal_number
 .Ar pid
 \&...
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 51d989280531..6eb4f60d0195 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -43,11 +43,11 @@
 .Nm link
 .Nd make links
 .Sh SYNOPSIS
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file
 .Op target_file
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file ...
 .Op target_dir
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 3e474bac0113..1ff329523477 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -80,7 +80,7 @@ exceeded.)
 .Pp
 There are three separate areas that need to be discussed.
 They are as follows:
-.sp
+.Pp
 .Bl -enum -compact -offset indent
 .It
 Symbolic links used as file name arguments for system calls.
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 29a303fc0337..f0a05de97c14 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -42,7 +42,7 @@
 .Nm ls
 .Nd list directory contents
 .Sh SYNOPSIS
-.Nm ls
+.Nm
 .Op Fl ABCFGHLPRTWabcdfgiklnoqrstu1
 .Op Ar file ...
 .Sh DESCRIPTION
@@ -364,7 +364,7 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
 If the environment variable
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 759382ecfe55..54d9faccbbf7 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -42,7 +42,7 @@
 .Nm mkdir
 .Nd make directories
 .Sh SYNOPSIS
-.Nm mkdir
+.Nm
 .Op Fl pv
 .Op Fl m Ar mode
 .Ar directory_name  ...
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 528eeaa1a8be..c76c69b5e1e5 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -42,11 +42,11 @@
 .Nm mv
 .Nd move files
 .Sh SYNOPSIS
-.Nm mv
+.Nm
 .Op Fl f | Fl i
 .Op Fl v
 .Ar source target
-.Nm mv
+.Nm
 .Op  Fl f | Fl i
 .Op Fl v
 .Ar source ... directory
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 43311b9f7756..84f408138d73 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -43,7 +43,7 @@
 .Nm pax
 .Nd read and write file archives and copy directory hierarchies
 .Sh SYNOPSIS
-.Nm pax
+.Nm
 .Op Fl cdnv
 .Bk -words
 .Op Fl f Ar archive
@@ -69,7 +69,7 @@
 .Ar ...
 .Ek
 .Op Ar pattern ...
-.Nm pax
+.Nm
 .Fl r
 .Op Fl cdiknuvDYZ
 .Bk -words
@@ -105,7 +105,7 @@
 .Ar ...
 .Ek
 .Op Ar pattern ...
-.Nm pax
+.Nm
 .Fl w
 .Op Fl dituvHLPX
 .Bk -words
@@ -147,7 +147,7 @@
 .Ar ...
 .Ek
 .Op Ar file ...
-.Nm pax
+.Nm
 .Fl r
 .Fl w
 .Op Fl diklntuvDHLPXYZ
@@ -640,7 +640,7 @@ are not selected and will be skipped.
 Reset the access times of any file or directory read or accessed by
 .Nm
 to be the same as they were before being read or accessed by
-.Nm Ns .
+.Nm .
 .It Fl u
 Ignore files that are older (having a less recent file modification time)
 than a pre-existing file or archive member with the same name.
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index f89f8da0ed6d..a3a4b97cf0c0 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -39,7 +39,7 @@
 .Nm ps
 .Nd process status
 .Sh SYNOPSIS
-.Nm ps
+.Nm
 .Op Fl aCcefhjlmrSTuvwx
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -49,7 +49,7 @@
 .Op Fl t Ar tty
 .Op Fl U Ar username
 .Op Fl W Ar swap
-.Nm ps
+.Nm
 .Op Fl L
 .Sh DESCRIPTION
 .Nm Ps
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 455f791be0a7..afbe03c753a0 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -42,7 +42,7 @@
 .Nm pwd
 .Nd return working directory name
 .Sh SYNOPSIS
-.Nm pwd
+.Nm
 .Sh DESCRIPTION
 .Nm Pwd
 writes the absolute pathname of the current working directory to
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 3034e20b486a..274042da1f45 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -39,11 +39,11 @@
 .Nm rcp
 .Nd remote file copy
 .Sh SYNOPSIS
-.Nm rcp
+.Nm
 .Op Fl Kpx
 .Op Fl k Ar realm
 .Ar file1 file2
-.Nm rcp
+.Nm
 .Op Fl Kprx
 .Op Fl k Ar realm
 .Ar file ...
@@ -93,7 +93,7 @@ the destination must be a directory.
 Turn on
 .Tn DES
 encryption for all data passed by
-.Nm Ns .
+.Nm .
 This may impact response time and
 .Tn CPU
 utilization, but provides
@@ -160,4 +160,4 @@ The destination user and hostname may have to be specified as
 when the destination machine is running the
 .Bx 4.2
 version of
-.Nm Ns  .
+.Nm .
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index a038392f6f14..d93a069a30fc 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -43,7 +43,7 @@
 .Nm unlink
 .Nd remove directory entries
 .Sh SYNOPSIS
-.Nm rm
+.Nm
 .Op Fl dfiPRrvW
 .Ar file ...
 .Nm unlink
@@ -195,7 +195,7 @@ command is almost
 compatible, except that
 .Tn POSIX
 requires
-.Nm rm
+.Nm
 to act like
 .Xr rmdir 1
 when the
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index a6a247873b5b..018b793ae853 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -42,7 +42,7 @@
 .Nm rmdir
 .Nd remove directories
 .Sh SYNOPSIS
-.Nm rmdir
+.Nm
 .Op Fl p
 .Ar directory ...
 .Sh DESCRIPTION
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 6e1bf1fcf479..30af258663cb 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -564,7 +564,7 @@ whose
 representation is
 .Qq #! ,
 resulting in an
-.Dv ENOEXEC
+.Er ENOEXEC
 return value from
 .Xr execve 2 )
 the shell will interpret the program in a subshell.
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 26732d2d6a69..7a4bed8a7947 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -42,7 +42,7 @@
 .Nm stty
 .Nd set the options for a terminal device interface
 .Sh SYNOPSIS
-.Nm stty
+.Nm
 .Op Fl a | Fl e | Fl g
 .Op Fl f Ar file
 .Op operands
@@ -480,14 +480,12 @@ This means that unsetting
 may not put back all the setting that were previously in effect.
 To set the terminal into a raw state and then accurately restore it, the following
 shell code is recommended:
-.nf
-
+.Bd -literal
 save_state=$(stty -g)
 stty raw
 \&...
 stty "$save_state"
-
-.fi
+.Ed
 .It Cm size
 The size of the terminal is printed as two numbers on a single line,
 first rows, then columns.
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index ea45b3d2ed14..896b763b3121 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -39,7 +39,7 @@
 .Nm sync
 .Nd force completion of pending disk writes (flush cache)
 .Sh SYNOPSIS
-.Nm sync
+.Nm
 .Sh DESCRIPTION
 .Nm Sync
 can be called to insure that all disk writes have been completed before the
@@ -55,7 +55,7 @@ to shut down the system,
 as they may perform additional actions
 such as resynchronizing the hardware clock
 and flushing internal caches before performing a final
-.Nm Ns .
+.Nm .
 .Pp
 .Nm Sync
 utilizes the
diff --git a/bin/test/test.1 b/bin/test/test.1
index da9686bc58f1..fde84341164d 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -43,13 +43,13 @@
 .Nm \&[
 .Nd condition evaluation utility
 .Sh SYNOPSIS
-.Nm test
+.Nm
 .Ar expression
-.Nm [
+.Nm \&[
 .Ar expression Cm ]
 .Sh DESCRIPTION
 The
-.Nm test
+.Nm
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -57,7 +57,7 @@ If there is no expression, test also
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm test
+.Nm
 utility.
 .Pp
 The following primaries are used to construct expression:
@@ -288,7 +288,7 @@ operator has higher precedence than the
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm test
+.Nm
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -298,7 +298,7 @@ standards document.  All other cases are subject to the ambiguity in the
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm test
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -314,7 +314,7 @@ An error occurred.
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm test
+.Nm
 utility implements a superset of the
 .St -p1003.2
 specification.
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index 0677640d399e..6abb548df8a2 100644
--- a/contrib/pnpinfo/pnpinfo.8
+++ b/contrib/pnpinfo/pnpinfo.8
@@ -51,7 +51,7 @@ A few of the tags are unimplemented (Enough exist for 99% of PnP cards).
 The
 .Nm
 utility first appeared in
-.Tn FreeBSD
+.Fx
 2.2.
 .Sh AUTHOR
 .Bl -tag
diff --git a/crypto/telnet/telnet/telnet.1 b/crypto/telnet/telnet/telnet.1
index 3378d3a4ad92..3958f20fbe36 100644
--- a/crypto/telnet/telnet/telnet.1
+++ b/crypto/telnet/telnet/telnet.1
@@ -41,7 +41,7 @@
 .Tn TELNET
 protocol
 .Sh SYNOPSIS
-.Nm telnet
+.Nm
 .Op Fl 8EFKLNacdfrx
 .Op Fl S Ar tos
 .Op Fl X Ar authtype
@@ -56,18 +56,18 @@ protocol
 .Oc
 .Sh DESCRIPTION
 The
-.Nm telnet
+.Nm
 command
 is used to communicate with another host using the 
 .Tn TELNET
 protocol.
 If
-.Nm telnet
+.Nm
 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
@@ -133,7 +133,7 @@ toggle to
 .It Fl e Ar escape char 
 Sets the initial
 .Nm
-.Nm telnet
+.Nm
 escape character to
 .Ar escape char.
 If
@@ -144,7 +144,6 @@ there will be no escape character.
 If Kerberos V5 authentication is being used, the
 .Fl f
 option allows the local credentials to be forwarded to the remote system.
-.ne 1i
 .It Fl k Ar realm
 If Kerberos authentication is being used, the
 .Fl k
@@ -194,7 +193,7 @@ of a remote host.
 .It Ar port
 Indicates a port number (address of an application).  If a number is
 not specified, the default
-.Nm telnet
+.Nm
 port is used.
 .El
 .Pp
@@ -204,12 +203,12 @@ Similarly, the line ~^Z suspends the telnet session.
 The line ~^] escapes to the normal telnet escape prompt.
 .Pp
 Once a connection has been opened,
-.Nm telnet
+.Nm
 will attempt to enable the
 .Dv TELNET LINEMODE
 option.
 If this fails, then
-.Nm telnet
+.Nm
 will revert to one of two input modes:
 either \*(Lqcharacter at a time\*(Rq
 or \*(Lqold line by line\*(Rq
@@ -281,14 +280,14 @@ and
 .Ic intr  ) .
 .Pp
 While connected to a remote host,
-.Nm telnet
+.Nm
 command mode may be entered by typing the
-.Nm telnet
+.Nm
 \*(Lqescape character\*(Rq (initially \*(Lq^]\*(Rq).
 When in command mode, the normal terminal editing conventions are available.
 .Pp
 The following
-.Nm telnet
+.Nm
 commands are available.
 Only enough of each command to uniquely identify it need be typed
 (this is also true for arguments to the
@@ -415,7 +414,7 @@ variable is also exported if the
 or
 .Fl l
 options are used.
-.br
+.Pp
 Valid arguments for the
 .Ic environ
 command are:
@@ -520,7 +519,6 @@ option.
 This requires that the 
 .Dv LINEMODE
 option be enabled.
-.ne 1i
 .It Ic litecho Pq Ic \-litecho 
 Attempt to enable (disable) the 
 .Dv LIT_ECHO
@@ -545,7 +543,7 @@ command.
 Open a connection to the named host.
 If no port number
 is specified,
-.Nm telnet
+.Nm
 will attempt to contact a
 .Tn TELNET
 server at the default port.
@@ -561,7 +559,7 @@ to be passed to the remote system via the
 .Ev ENVIRON
 option.
 When connecting to a non-standard port,
-.Nm telnet
+.Nm
 omits any automatic initiation of
 .Tn TELNET
 options.  When the port number is preceded by a minus sign,
@@ -575,16 +573,16 @@ without white space are the start of a machine entry.  The
 first thing on the line is the name of the machine that is
 being connected to.  The rest of the line, and successive
 lines that begin with white space are assumed to be
-.Nm telnet
+.Nm
 commands and are processed as if they had been typed
 in manually to the
-.Nm telnet
+.Nm
 command prompt.
 .It Ic quit
 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.
@@ -641,7 +639,7 @@ Sends the
 sequence.
 .It Ic escape
 Sends the current
-.Nm telnet
+.Nm
 escape character (initially \*(Lq^\*(Rq).
 .It Ic ga
 Sends the
@@ -655,7 +653,6 @@ command,
 .Ic getstatus
 will send the subnegotiation to request that the server send
 its current option status.
-.ne 1i
 .It Ic ip
 Sends the
 .Dv TELNET IP
@@ -714,7 +711,7 @@ command.
 The
 .Ic set
 command will set any one of a number of
-.Nm telnet
+.Nm
 variables to a specific value or to
 .Dv TRUE .
 The special value
@@ -760,7 +757,7 @@ of entered characters (for normal processing), and suppressing
 echoing of entered characters (for entering, say, a password).
 .It Ic eof
 If
-.Nm telnet
+.Nm
 is operating in
 .Dv LINEMODE
 or \*(Lqold line by line\*(Rq mode, entering this character
@@ -771,7 +768,7 @@ The initial value of the eof character is taken to be the terminal's
 character.
 .It Ic erase
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode (see
@@ -780,7 +777,7 @@ mode (see
 below),
 .Sy and
 if
-.Nm telnet
+.Nm
 is operating in \*(Lqcharacter at a time\*(Rq mode, then when this
 character is typed, a
 .Dv TELNET EC
@@ -795,14 +792,14 @@ the terminal's
 character.
 .It Ic escape
 This is the
-.Nm telnet
+.Nm
 escape character (initially \*(Lq^[\*(Rq) which causes entry
 into
-.Nm telnet
+.Nm
 command mode (when connected to a remote system).
 .It Ic flushoutput
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode (see
@@ -835,7 +832,7 @@ the forwarding characters are taken from the terminal's
 eol and eol2 characters.
 .It Ic interrupt
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode (see
@@ -857,7 +854,7 @@ the terminal's
 character.
 .It Ic kill
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode (see
@@ -866,7 +863,7 @@ mode (see
 below),
 .Ic and
 if
-.Nm telnet
+.Nm
 is operating in \*(Lqcharacter at a time\*(Rq mode, then when this
 character is typed, a
 .Dv TELNET EL
@@ -881,7 +878,7 @@ the terminal's
 character.
 .It Ic lnext
 If
-.Nm telnet
+.Nm
 is operating in
 .Dv LINEMODE
 or \*(Lqold line by line\*(Lq mode, then this character is taken to
@@ -894,7 +891,7 @@ the terminal's
 character.
 .It Ic quit
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode (see
@@ -916,7 +913,7 @@ the terminal's
 character.
 .It Ic reprint
 If
-.Nm telnet
+.Nm
 is operating in
 .Dv LINEMODE
 or \*(Lqold line by line\*(Lq mode, then this character is taken to
@@ -963,7 +960,7 @@ the terminal's
 character.
 .It Ic susp
 If
-.Nm telnet
+.Nm
 is in
 .Ic localchars
 mode, or
@@ -981,7 +978,6 @@ The initial value for the suspend character is taken to be
 the terminal's
 .Ic suspend
 character.
-.ne 1i
 .It Ic tracefile
 This is the file to which the output, caused by
 .Ic netdata
@@ -994,7 +990,7 @@ will be written.  If it is set to
 then tracing information will be written to standard output (the default).
 .It Ic worderase
 If
-.Nm telnet
+.Nm
 is operating in
 .Dv LINEMODE
 or \*(Lqold line by line\*(Lq mode, then this character is taken to
@@ -1045,7 +1041,7 @@ the local side, the local side will switch to the remote value.
 Switch to the local defaults for the special characters.  The
 local default characters are those of the local terminal at
 the time when
-.Nm telnet
+.Nm
 was started.
 .It Ic import
 Switch to the remote defaults for the special characters.
@@ -1060,7 +1056,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 ... 
@@ -1069,7 +1065,7 @@ Toggle (between
 and
 .Dv FALSE )
 various flags that control how
-.Nm telnet
+.Nm
 responds to events.
 These flags may be set explicitly to
 .Dv TRUE
@@ -1104,7 +1100,7 @@ characters are recognized (and transformed into
 sequences; see
 .Ic set
 above for details),
-.Nm telnet
+.Nm
 refuses to display any data on the user's terminal
 until the remote system acknowledges (via a
 .Dv TELNET TIMING MARK
@@ -1128,7 +1124,6 @@ stream does not start automatically.  The autoencrypt
 (autodecrypt) command states that encryption of the
 output (input) stream should be enabled as soon as
 possible.
-.sp
 .Pp
 Note:  Because of export controls, the
 .Dv TELNET ENCRYPT
@@ -1278,13 +1273,12 @@ The initial value for this toggle is
 .Dv FALSE .
 .It Ic options
 Toggles the display of some internal
-.Nm telnet
+.Nm
 protocol processing (having to do with
 .Tn TELNET
 options).
 The initial value for this toggle is
 .Dv FALSE .
-.ne 1i
 .It Ic prettydump
 When the
 .Ic netdata
@@ -1329,7 +1323,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 
@@ -1340,10 +1334,10 @@ is omitted, then an interactive
 subshell is invoked.
 .It Ic \&? Op Ar command 
 Get help.  With no arguments,
-.Nm telnet
+.Nm
 prints a help summary.
 If a command is specified,
-.Nm telnet
+.Nm
 will print the help information for just that command.
 .El
 .Sh ENVIRONMENT
diff --git a/crypto/telnet/telnetd/telnetd.8 b/crypto/telnet/telnetd/telnetd.8
index 5835c7dba7f5..38c791e47fc6 100644
--- a/crypto/telnet/telnetd/telnetd.8
+++ b/crypto/telnet/telnetd/telnetd.8
@@ -170,7 +170,7 @@ information, plus some additional information
 about what processing is going on.
 .It Cm netdata
 Display the data stream received by
-.Nm Ns .
+.Nm .
 .It Cm ptydata
 Display data written to the pty.
 .It Cm exercise
@@ -315,7 +315,6 @@ indicates that only dotted decimal addresses
 should be put into the
 .Pa utmp
 file.
-.ne 1i
 .It Fl U
 This option causes
 .Nm
@@ -333,7 +332,7 @@ It disables the use of
 authentication, and
 can be used to temporarily disable
 a specific authentication type without having to recompile
-.Nm Ns .
+.Nm .
 .El
 .Pp
 .Nm Telnetd
@@ -432,7 +431,6 @@ Whenever a
 command is received, it is always responded
 to with a
 .Dv WILL TIMING-MARK
-.ne 1i
 .It "WILL LOGOUT"
 When a
 .Dv DO LOGOUT
diff --git a/games/adventure/adventure.6 b/games/adventure/adventure.6
index 501a3e11bc5e..a6735850aaa4 100644
--- a/games/adventure/adventure.6
+++ b/games/adventure/adventure.6
@@ -44,7 +44,7 @@
 .Nm adventure
 .Nd an exploration game
 .Sh SYNOPSIS
-.Nm adventure
+.Nm
 .Op saved-file
 .Sh DESCRIPTION
 The object of the game is to locate and explore Colossal Cave, find the
diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6
index 732a4ee23f5e..41a5188e3ee6 100644
--- a/games/bcd/bcd.6
+++ b/games/bcd/bcd.6
@@ -41,7 +41,7 @@
 .Nm morse
 .Nd "reformat input as punch cards, paper tape or morse code"
 .Sh SYNOPSIS
-.Nm bcd
+.Nm
 .Op Ar string ...
 .Nm ppt
 .Op Ar string ...
@@ -55,7 +55,7 @@
 .Op Ar string ...
 .Sh DESCRIPTION
 The commands
-.Nm bcd ,
+.Nm ,
 .Nm ppt
 and
 .Nm morse
@@ -170,8 +170,7 @@ Sound support for
 added by Lyndon Nerenberg (VE7TCP/VE6BBM) <lyndon@orthanc.com>.
 .Pp
 Ability to key an external device added by
-.ie t J\(:org Wunsch
-.el Joerg Wunsch
+.An J\(:org Wunsch
 (DL8DTL).
 .Sh BUGS
 Does only understand a few European characters (namely German and
diff --git a/games/caesar/caesar.6 b/games/caesar/caesar.6
index 59abc49a1333..4ba2e6597eca 100644
--- a/games/caesar/caesar.6
+++ b/games/caesar/caesar.6
@@ -39,11 +39,11 @@
 .Nm caesar
 .Nd decrypt caesar ciphers
 .Sh SYNOPSIS
-.Nm caesar
+.Nm
 .Op Ar rotation
 .Sh DESCRIPTION
 The
-.Nm caesar
+.Nm
 utility attempts to decrypt caesar ciphers using English letter frequency
 statistics.
 .Nm Caesar
diff --git a/games/dm/dm.8 b/games/dm/dm.8
index f324db6d0316..3c9600bd5ea8 100644
--- a/games/dm/dm.8
+++ b/games/dm/dm.8
@@ -47,7 +47,7 @@ is a program used to regulate game playing.
 .Nm Dm
 expects to be invoked with the name of a game that a user wishes to play.
 This is done by creating symbolic links to
-.Nm dm ,
+.Nm ,
 in the directory
 .Pa /usr/games
 for all of the regulated games.
@@ -56,7 +56,7 @@ The actual binaries for these games should be placed in a
 directory,
 .Pa /usr/games/hide ,
 that may only be accessed by the
-.Nm dm
+.Nm
 program.
 .Nm Dm
 determines if the requested game is available and, if so, runs it.
@@ -87,7 +87,7 @@ game logging file
 .Xr dm.conf 5
 .Sh BUGS
 Two problems result from
-.Nm dm
+.Nm
 running the games setuid
 .Dq games .
 First, all games that allow users to run
@@ -95,7 +95,7 @@ First, all games that allow users to run
 commands should carefully
 set both the real and effective user id's immediately before executing
 those commands.  Probably more important is that
-.Nm dm
+.Nm
 never be setuid
 anything but
 .Dq games
@@ -105,6 +105,6 @@ had no reason to run setuid and which accessed user files may have to
 be modified.
 .Sh HISTORY
 The
-.Nm dm
+.Nm
 command appeared in
 .Bx 4.3 tahoe .
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index f58fc94c3da8..46e79b73e34f 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -42,7 +42,7 @@
 .Nm fortune
 .Nd "print a random, hopefully interesting, adage"
 .Sh SYNOPSIS
-.Nm fortune
+.Nm
 .Op Fl aDefilosw
 .Op Fl m Ar pattern
 .Oo
@@ -51,7 +51,7 @@
 .Oc
 .Sh DESCRIPTION
 When
-.Nm fortune
+.Nm
 is run with no arguments it prints out a random epigram.
 Epigrams are divided into several categories, where each category
 is subdivided into those which are potentially offensive and those
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 0d992b8ad49e..2fed695a6798 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -44,7 +44,7 @@
 .Nm unstr
 .Nd "create a random access file for storing strings"
 .Sh SYNOPSIS
-.Nm strfile
+.Nm
 .Op Fl iorsx
 .Op Fl c Ar char
 .Ar source_file
@@ -128,7 +128,7 @@ All fields are written in network byte order.
 The purpose of
 .Nm unstr
 is to undo the work of
-.Nm strfile .
+.Nm .
 It prints out the strings contained in the file
 .Ar source_file
 in the order that they are listed in
@@ -138,7 +138,7 @@ to standard output.
 It is possible to create sorted versions of input files by using
 .Fl o
 when
-.Nm strfile
+.Nm
 is run and then using
 .Nm unstr
 to dump them out in the table order.
@@ -152,5 +152,5 @@ default output file.
 .El
 .Sh HISTORY
 The
-.Nm strfile
+.Nm
 utility first appeared in 4.4BSD.
diff --git a/games/larn/larn.6 b/games/larn/larn.6
index ec55fef246e2..13cd0f6b0e59 100644
--- a/games/larn/larn.6
+++ b/games/larn/larn.6
@@ -39,7 +39,7 @@
 .Nm larn
 .Nd exploring the caverns of Larn
 .Sh SYNOPSIS
-.Nm larn
+.Nm
 .Op Fl r
 .Op Fl H Ar number
 .Op Fl n
@@ -100,7 +100,7 @@ v print program version	S save the game	D list all items found
 The file
 .Pa ~/.larnopts
 may be used to set a few options for
-.Nm Larn.
+.Nm Larn .
 A sequence of words terminated by whitespace is used to specify options.
 .Pp
 .Bl -tag -width "savefile: xsave-file-namex" -compact
diff --git a/games/number/number.6 b/games/number/number.6
index a7b339db814b..c5081e846403 100644
--- a/games/number/number.6
+++ b/games/number/number.6
@@ -36,18 +36,19 @@
 .Dt NUMBER 6
 .Os
 .Sh NAME
-number \- convert Arabic numerals to English
-.Sh SYNOPSIS
 .Nm number
+.Nd convert Arabic numerals to English
+.Sh SYNOPSIS
+.Nm
 .Op Fl l
 .Op Ar \&# ...
 .Sh DESCRIPTION
 The
-.Nm number
+.Nm
 utility prints the English equivalent of the number to the standard
 output, with each 10^3 magnitude displayed on a separate line.
 If no argument is specified,
-.Nm number
+.Nm
 reads lines from the standard input.
 .Pp
 The options are as follows:
@@ -57,5 +58,5 @@ Display the number on a single line.
 .El
 .Sh BUGS
 Although
-.Nm number
+.Nm
 understand fractions, it doesn't understand exponents.
diff --git a/games/piano/piano.6 b/games/piano/piano.6
index 7c80cdf33e0c..f98cea5f9c47 100644
--- a/games/piano/piano.6
+++ b/games/piano/piano.6
@@ -1,3 +1,5 @@
+.\" $FreeBSD$
+.\"
 .Dd Feb 3, 1995
 .Dt "PIANO" 6
 .Os
@@ -5,12 +7,12 @@
 .Nm piano
 .Nd "a piano emulator"
 .Sh SYNOPSIS
-.Nm piano
+.Nm
 .Op Fl vV
 .Op Fl i Ar string
 .Sh DESCRIPTION
 The
-.Nm piano
+.Nm
 plays note by typing
 .Em "QWERTYUIOP[]"
 or
@@ -18,7 +20,7 @@ or
 Type
 .Em ESC
 key to quit
-.Nm piano .
+.Nm .
 .Nm Piano
 uses
 .Em /dev/speaker .
@@ -29,14 +31,14 @@ Available option:
 The
 .Fl v
 option causes
-.Nm piano
+.Nm
 to generate
 .Em "play-string language" .
 .It Fl V
 The
 .Fl V
 option is for 
-.Nm piano
+.Nm
 usage.
 .It Fl i Ar string
 The
diff --git a/games/pig/pig.6 b/games/pig/pig.6
index c97b50f95fcd..f67c4754e2c1 100644
--- a/games/pig/pig.6
+++ b/games/pig/pig.6
@@ -39,7 +39,7 @@
 .Nm pig
 .Nd eformatray inputway asway Igpay Atinlay
 .Sh SYNOPSIS
-.Nm pig
+.Nm
 .Sh DESCRIPTION
 Ethay
 .Nm igpay
diff --git a/games/quiz/quiz.6 b/games/quiz/quiz.6
index 7234989b7484..d8706db58820 100644
--- a/games/quiz/quiz.6
+++ b/games/quiz/quiz.6
@@ -42,17 +42,17 @@
 .Nm quiz
 .Nd random knowledge tests
 .Sh SYNOPSIS
-.Nm quiz
+.Nm
 .Op Fl t
 .Op Fl i Ar file
 .Op Ar question answer
 .Sh DESCRIPTION
 The
-.Nm quiz
+.Nm
 utility tests your knowledge of random facts.
 It has a database of subjects from which you can choose.
 With no arguments,
-.Nm quiz
+.Nm
 displays the list of available subjects.
 .Pp
 The options are as follows:
@@ -76,7 +76,7 @@ untimely demise, whereas the command ``quiz killer victim'' works the
 other way around.
 .Pp
 If you get the answer wrong,
-.Nm quiz
+.Nm
 lets you try again.
 To see the right answer, enter a blank line.
 .Sh "Index and Data File Syntax"
@@ -84,7 +84,7 @@ The index and data files have a similar syntax.
 Lines in them consist of several categories separated by colons.
 The categories are regular expressions formed using the following
 meta-characters:
-.sp
+.Pp
 .Bl -tag -width "pat|pat" -compact -offset indent
 .It pat|pat
 alternate patterns
@@ -108,7 +108,7 @@ characters, or at the end of a line to signify that a continuation line
 follows.
 .Pp
 If either a question or its answer is empty,
-.Nm quiz
+.Nm
 will refrain from asking it.
 .Sh FILES
 .Bl -tag -width /usr/share/games/quiz.db -compact
diff --git a/games/random/random.6 b/games/random/random.6
index 63eddb271255..503e03fdd928 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -39,7 +39,7 @@
 .Nm random
 .Nd random lines from a file or random numbers
 .Sh SYNOPSIS
-.Nm random
+.Nm
 .Op Fl er
 .Op Ar denominator
 .Sh DESCRIPTION
@@ -56,7 +56,7 @@ The options are as follows:
 If the
 .Fl e
 option is specified,
-.Nm random
+.Nm
 does not read or write anything, and simply exits with a random
 exit value of 0 to
 .Ar denominator
diff --git a/games/wargames/wargames.6 b/games/wargames/wargames.6
index 2070f559a7bf..5f524907ddf0 100644
--- a/games/wargames/wargames.6
+++ b/games/wargames/wargames.6
@@ -35,11 +35,11 @@
 .Nm wargames
 .Nd shall we play a game?
 .Sh SYNOPSIS
-.Nm wargames
+.Nm
 .Sh DESCRIPTION
 .Dq Shall we play a game?
 -- computer,
-.Nm wargames
+.Nm
 .Pp
 Just like in the movie, the computer will happily play a
 game with you. The likelihood of Global Thermonuclear Warfare
@@ -47,5 +47,5 @@ resulting is much smaller....
 .Sh SEE ALSO
 Wargames,
 the movie (an MGM production, PGP 13, directed by John Badham, 1983).
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page was written by Joey Hess <joeyh@kitenet.net>.
diff --git a/games/worms/worms.6 b/games/worms/worms.6
index 374d18d6910e..db9b6cb74245 100644
--- a/games/worms/worms.6
+++ b/games/worms/worms.6
@@ -38,7 +38,7 @@
 .Nm worms
 .Nd animate worms on a display terminal
 .Sh SYNOPSIS
-.Nm worms
+.Nm
 .Op Fl ft
 .Op Fl d Ar delay
 .Op Fl l Ar length
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