diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 7c2cc24592a0..6ca41d9682ea 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.1 (Berkeley) 6/29/93
+.\"	$Id$
 .\"
 .Dd June 29, 1993
 .Dt CKSUM 1
@@ -41,12 +42,12 @@
 .Nm cksum
 .Nd display file checksums and block counts
 .Sh SYNOPSIS
-.Nm cksum
+.Nm
 .Op Fl o Op \&1 \&| \&2
 .Op Ar file ...
 .Sh DESCRIPTION
 The
-.Nm cksum
+.Nm
 utility writes to the standard output three whitespace separated
 fields for each input file.
 These fields are a checksum
@@ -140,7 +141,7 @@ The bit sequence is complemented and the result is the CRC.
 .Ed
 .Pp
 The
-.Nm cksum
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 The default calculation is identical to that given in pseudo-code
@@ -155,10 +156,10 @@ article.
 .Re
 .Sh STANDARDS
 The
-.Nm cksum
+.Nm
 utility is expected to be POSIX 1003.2 compatible.
 .Sh HISTORY
 The
-.Nm cksum
-utility appears in
+.Nm
+utility appeared in
 .Bx 4.4 .
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 99010fc8b934..8e9f723f8c5c 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
+.\"	$Id$
 .\"
 .Dd "June 6, 1993"
 .Dt ID 1
@@ -41,22 +42,22 @@
 .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 g Op Fl nr
 .Op Ar user
-.Nm id
+.Nm
 .Fl p
-.Nm id
+.Nm
 .Fl u Op Fl nr
 .Op Ar user
 .Sh DESCRIPTION
 The
-.Nm id
+.Nm
 utility displays the user and group names and numeric IDs, of the
 calling process, to the standard output.
 If the real and effective IDs are different, both are displayed,
@@ -91,14 +92,19 @@ If the user name returned by
 is different from the login name referenced by the user ID, the name
 returned by
 .Xr getlogin 2
-is displayed, preceded by the keyword ``login''.
-The user ID as a name is displayed, preceded by the keyword ``uid''.
+is displayed, preceded by the keyword
+.Dq login .
+The user ID as a name is displayed, preceded by the keyword
+.Dq uid .
 If the effective user ID is different from the real user ID, the real user
-ID is displayed as a name, preceded by the keyword ``euid''.
+ID is displayed as a name, preceded by the keyword
+.Dq euid .
 If the effective group ID is different from the real group ID, the real group
-ID is displayed as a name, preceded by the keyword ``rgid''.
+ID is displayed as a name, preceded by the keyword
+.Dq rgid .
 The list of groups to which the user belongs is then displayed as names,
-preceded by the keyword ``groups''.
+preceded by the keyword
+.Dq groups .
 Each display is on a separate line.
 .It Fl r
 Display the real ID for the
@@ -111,13 +117,13 @@ Display the effective user ID as a number.
 .El
 .Pp
 The
-.Nm id
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr who 1
 .Sh STANDARDS
 The
-.Nm id
+.Nm
 function is expected to conform to
 .St -p1003.2 .
 .Sh HISTORY
@@ -135,5 +141,5 @@ command is equivalent to
 .Pp
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 52c9da1271ec..99a147136373 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
+.\"	$Id$
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
@@ -38,14 +39,15 @@
 .Nm kdump
 .Nd display kernel trace data
 .Sh SYNOPSIS
-.Nm kdump
+.Nm
 .Op Fl dnlRT
 .Op Fl f Ar file
 .Op Fl m Ar maxdata
 .Op Fl t Op cnisu
 .Sh DESCRIPTION
-.Nm Kdump
-displays the kernel trace files produced with
+The
+.Nm
+command displays the kernel trace files produced with
 .Xr ktrace 1
 in human readable format.
 By default, the file
@@ -70,7 +72,7 @@ bytes when decoding
 .It Fl n
 Suppress ad hoc translations.
 Normally
-.Nm kdump
+.Nm
 tries to decode many system calls into a more human readable format.
 For example,
 .Xr ioctl 2
@@ -95,6 +97,6 @@ option of
 .Xr ktrace 1
 .Sh HISTORY
 The
-.Nm kdump
-command appears in
+.Nm
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 48a2e646e284..af9e14c20b03 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
+.\"	$Id$
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
@@ -38,20 +39,21 @@
 .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
 command
 .Sh DESCRIPTION
-.Nm Ktrace
-enables kernel trace logging for the specified processes.
+The
+.Nm
+command enables kernel trace logging for the specified processes.
 Kernel trace data is logged to the file
 .Pa ktrace.out .
 The kernel operations that are traced include system calls, namei
@@ -166,6 +168,6 @@ Only works if
 is a regular file.
 .Sh HISTORY
 The
-.Nm ktrace
-command appears in
+.Nm
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index afdb279d4c14..b48f78524b64 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
+.\"	$Id$
 .\"
 .Dd "June 9, 1993"
 .Dt LOGNAME 1
@@ -41,15 +42,15 @@
 .Nm logname
 .Nd display user's login name
 .Sh SYNOPSIS
-.Nm logname
+.Nm
 .Sh DESCRIPTION
 The
-.Nm logname
+.Nm
 utility writes the user's login name to standard output followed by
 a newline.
 .Pp
 The
-.Nm logname
+.Nm
 utility explicitly ignores the
 .Ev LOGNAME
 and
@@ -58,7 +59,7 @@ environment variables
 because the environment cannot be trusted.
 .Pp
 The
-.Nm logname
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr who 1 ,
@@ -66,11 +67,11 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr getlogin 2
 .Sh STANDARDS
 The
-.Nm logname
+.Nm
 function is expected to conform to
 .St -p1003.2 .
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index eb8e5dc48b46..3aa3ee993051 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
+.\"	$Id$
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
@@ -41,22 +42,25 @@
 .Nm mkfifo
 .Nd make fifos
 .Sh SYNOPSIS
-.Nm mkfifo
+.Nm
 .Ar fifo_name  ...
 .Sh DESCRIPTION
-.Nm Mkfifo
-creates the fifos requested, in the order specified,
+The
+.Nm
+command creates the fifos requested, in the order specified,
 using mode
 .Li \&0777 .
 .Pp
-.Nm Mkfifo
-requires write permission in the parent directory.
+The
+.Nm
+command requires write permission in the parent directory.
 .Pp
-.Nm Mkfifo
-exits 0 if successful, and >0 if an error occurred.
+The
+.Nm
+command exits 0 if successful, and >0 if an error occurred.
 .Sh STANDARDS
 The
-.Nm mkfifo
+.Nm
 utility is expected to be
 .St -p1003.2
 compliant.
@@ -69,5 +73,5 @@ compliant.
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 227f3f0256ab..4d29692de52d 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\"	$Id: nfsstat.1,v 1.6 1997/02/22 19:56:24 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
@@ -41,13 +41,14 @@
 .Tn NFS
 statistics
 .Sh SYNOPSIS
-.Nm nfsstat
+.Nm
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl w Ar wait
 .Sh DESCRIPTION
-.Nm Nfsstat
-displays statistics kept about
+The
+.Nm
+command displays statistics kept about
 .Tn NFS
 client and server activity.
 .Pp
@@ -85,6 +86,6 @@ default memory file
 .Xr vmstat 8
 .Sh HISTORY
 The
-.Nm nfsstat
-command appears in
+.Nm
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 9a5fe4bb8b2e..b85f7cecf5ca 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
+.\"	$Id$
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
@@ -40,8 +41,9 @@
 .Sh SYNOPSIS
 .Nm shar Ar
 .Sh DESCRIPTION
-.Nm Shar
-writes an
+The
+.Nm
+command writes a
 .Xr sh 1
 shell script to the standard output which will recreate the file
 hierarchy specified by the command line operands.
@@ -50,8 +52,9 @@ files they contain (the
 .Xr find 1
 utility does this correctly).
 .Pp
-.Nm Shar
-is normally used for distributing files by
+The
+.Nm
+command is normally used for distributing files by
 .Xr ftp  1
 or
 .Xr mail  1  .
@@ -61,21 +64,23 @@ or
 .Xr tar 1 ,
 .Xr uuencode 1
 .Sh BUGS
-.Nm Shar
-makes no provisions for special types of files or files containing
+The
+.Nm
+command makes no provisions for special types of files or files containing
 magic characters.
-.Nm Shar
-cannot handle files without a newline ('\\n')
+The
+.Nm
+command cannot handle files without a newline ('\\n')
 as the last character.
 .Pp
 It is easy to insert trojan horses into
-.Nm shar
+.Nm
 files.
 It is strongly recommended that all shell archive files be examined
 before running them through
 .Xr sh  1  .
 Archives produced using this implementation of
-.Nm shar
+.Nm
 may be easily examined with the command:
 .Bd -literal -offset indent
 egrep -v '^[X#]' shar.file
@@ -101,5 +106,5 @@ sh archive
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 3baa4ce8d61a..403f4ccb3a29 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
+.\"	$Id$
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
@@ -38,32 +39,37 @@
 .Nm tput
 .Nd terminal capability interface
 .Sh SYNOPSIS
-.Nm tput
+.Nm
 .Op Fl T Ar term
 .Ar attribute
 .Sh DESCRIPTION
-.Nm Tput
-makes terminal-dependent information available to users or shell
+The
+.Nm
+command makes terminal-dependent information available to users or shell
 applications.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl T
 The terminal name as specified in the
 .Xr termcap
-database, for example, ``vt100'' or ``xterm''.
+database, for example,
+.Dq vt100
+or
+.Dq xterm .
 If not specified,
-.Nm tput
+.Nm
 retrieves the
 .Dq Ev TERM
 variable from the environment.
 .El
 .Pp
-.Nm Tput
-outputs a string if the
+The
+.Nm
+command outputs a string if the
 .Ar attribute
 is of type string; a number if it is of type integer.
 Otherwise,
-.Nm tput
+.Nm
 exits 0 if the terminal has the capability and 1 if it does not,
 without further action.
 .Pp
@@ -80,36 +86,41 @@ The following special attributes are available:
 .It clear
 Clear the screen (the
 .Xr termcap
-``cl'' sequence).
+.Dq cl
+sequence).
 .It init
 Initialize the terminal (the
 .Xr termcap
-``is'' sequence).
+.Dq is
+sequence).
 .It longname
 Print the descriptive name of the user's terminal type.
 .It reset
 Reset the terminal (the
 .Xr termcap
-``rs'' sequence).
+.Dq rs
+sequence).
 .Sh DIAGNOSTICS
 The exit value of
-.Nm tput
+.Nm
 is based on the last attribute specified.
 If the attribute is of type string or of type integer,
-.Nm tput
+.Nm
 exits 0 if the attribute is defined for this terminal type and 1
 if it is not.
 If the attribute is of type boolean,
-.Nm tput
+.Nm
 exits 0 if the terminal has this attribute, and 1 if it does not.
-.Nm Tput
-exits 2 if any error occurred.
+The
+.Nm
+command exits 2 if any error occurred.
 .Sh SEE ALSO
 .Xr termcap 3 ,
 .Xr termcap 5
 .Sh BUGS
-.Nm Tput
-can't really distinguish between different types of attributes.
+The
+.Nm
+command can't really distinguish between different types of attributes.
 .Pp
 Some termcap entries depend upon having a
 .Sq %
@@ -121,5 +132,5 @@ stderr.
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 7af0a9e821bc..7aad08e056b3 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
+.\"	$Id$
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
@@ -38,12 +39,13 @@
 .Nm yyfix
 .Nd extract tables from y.tab.c
 .Sh SYNOPSIS
-.Nm yyfix
+.Nm
 .Ar file
 .Op Ar tables
 .Sh DESCRIPTION
-Programs have historically used a script (often named ``:yyfix'') to
-extract tables from the
+Programs have historically used a script (often named
+.Dq :yyfix )
+to extract tables from the
 .Xr yacc 1
 generated file
 .Pa y.tab.c .
@@ -52,17 +54,17 @@ As the names of the tables generated by the current version of
 are different from those of historical versions of
 .Xr yacc ,
 the shell script
-.Nm yyfix
+.Nm
 is provided to simplify the transition.
 .Pp
 The first (and required) argument to
-.Nm yyfix
+.Nm
 is the name of the file where the extracted tables should be stored.
 .Pp
 If further command line arguments are specified, they are taken as
 the list of tables to be extracted.
 Otherwise,
-.Nm yyfix
+.Nm
 attempts to determine if the
 .Pa y.tab.c
 file is from an old or new
@@ -108,5 +110,5 @@ File from which tables are extracted.
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .