25 files changed, 160 insertions, 119 deletions
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 784e83b5b339..c706dcc30960 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: mv.1,v 1.9 1997/02/22 14:04:11 peter Exp $
+.\"	$Id: mv.1,v 1.10 1997/10/26 10:33:02 helbig Exp $
 .\"
 .Dd May 31, 1993
 .Dt MV 1
@@ -49,9 +49,8 @@
 .Op  Fl f | Fl i
 .Ar source ... directory
 .Sh DESCRIPTION
-.Pp
 In its first form, the
-.Nm mv
+.Nm
 utility renames the file named by the
 .Ar source
 operand to the destination path named by the
@@ -61,7 +60,7 @@ This form is assumed when the last operand does not name an already
 existing directory.
 .Pp
 In its second form,
-.Nm mv
+.Nm
 moves each file named by a
 .Ar source
 operand to a destination file in the existing directory named by the
@@ -82,8 +81,8 @@ option overrides any previous
 .Fl i
 options.)
 .It Fl i
-Causes
-.Nm mv
+Cause
+.Nm
 to write a prompt to standard error before moving a file that would
 overwrite an existing file.
 If the response from the standard input begins with the character
@@ -103,7 +102,7 @@ It is an error for either the
 operand or the destination path to specify a directory unless both do.
 .Pp
 If the destination path does not have a mode which permits writing,
-.Nm mv
+.Nm
 prompts the user for confirmation as specified for the
 .Fl i
 option.
@@ -111,7 +110,7 @@ option.
 As the
 .Xr rename  2
 call does not work across file systems,
-.Nm mv
+.Nm
 uses
 .Xr cp 1
 and
@@ -125,7 +124,7 @@ rm -f destination_path && \e
 .Ed
 .Pp
 The
-.Nm mv
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr cp 1 ,
@@ -133,7 +132,7 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr symlink 7
 .Sh STANDARDS
 The
-.Nm mv
+.Nm
 utility is expected to be
 .St -p1003.2
 compatible.
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index e30b16ee74c1..5d821772d060 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: mv.c,v 1.16 1997/10/26 10:33:02 helbig Exp $
  */
 
 #ifndef lint
@@ -43,7 +41,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index d1f955f4a596..5289aa74c5c4 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: ar_io.c,v 1.8 1997/08/29 16:12:19 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 5b12c52480e5..e94cc1929620 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: ar_subs.c,v 1.9 1997/12/10 22:18:25 eivind Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 335bc1ff13d8..73cc0580deb8 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: buf_subs.c,v 1.8 1997/08/29 16:12:20 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index b2a23e16241a..36a1e8747da0 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: cache.c,v 1.8 1997/08/29 16:12:21 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index c1e43cfab345..df6f3f124a19 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: cpio.c,v 1.8 1997/08/29 16:12:21 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index baabde9f2e6f..1ddb59d61c3c 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: file_subs.c,v 1.8 1997/08/29 16:12:23 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index e2db74d40bdb..8a264aa3662e 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: ftree.c,v 1.8 1997/08/29 16:12:24 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 4777a1948905..501293d4f731 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: gen_subs.c,v 1.9 1997/02/22 14:04:31 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 66fc3e3266d5..4022626596d9 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: options.c,v 1.9 1997/08/29 16:12:27 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 800162bb5a71..f46dce1ea6fa 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: pat_rep.c,v 1.10 1997/08/29 16:12:27 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 557b8ee99708..e46facbdd972 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: pax.1,v 1.5 1997/02/22 14:04:38 peter Exp $
+.\"	$Id: pax.1,v 1.6 1998/03/19 07:26:37 charnier Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -194,7 +194,7 @@ The presence of the
 and the
 .Fl w
 options specifies which of the following functional modes
-.Nm pax
+.Nm
 will operate under:
 .Em list , read , write ,
 and
@@ -284,7 +284,7 @@ While processing a damaged archive during a
 or
 .Em list
 operation,
-.Nm pax
+.Nm
 will attempt to recover from media defects and will search through the archive
 to locate and process the largest number of archive members possible (see the
 .Fl E
@@ -298,7 +298,7 @@ If the
 .Ar directory
 operand does not exist, or it is not writable by the user,
 or it is not of type directory,
-.Nm Pax
+.Nm
 will exit with a non-zero exit status.
 .Pp
 The
@@ -317,7 +317,7 @@ be selected.
 When a
 .Ar pattern
 operand does not select at least one archive member,
-.Nm pax
+.Nm
 will write these
 .Ar pattern
 operands in a diagnostic message to
@@ -330,7 +330,7 @@ operand specifies the pathname of a file to be copied or archived.
 When a
 .Ar file
 operand does not select at least one archive member,
-.Nm pax
+.Nm
 will write these
 .Ar file
 operand pathnames in a diagnostic message to
@@ -357,7 +357,7 @@ and
 as the mode argument.
 When the selected archive format supports the specification of linked
 files and these files cannot be linked while the archive is being extracted,
-.Nm pax
+.Nm
 will write a diagnostic message to
 .Dv standard error
 and exit with a non-zero exit status at the completion of operation.
@@ -381,7 +381,7 @@ If an archive format is not specified with a
 option, the format currently being used in the archive will be selected.
 Any attempt to append to an archive in a format different from the
 format already used in the archive will cause 
-.Nm pax
+.Nm
 to exit immediately
 with a non-zero exit status.
 The blocking size used in the archive volume where writing starts
@@ -450,7 +450,7 @@ or
 .Em write ) .
 A single archive may span multiple files and different archive devices.
 When required,
-.Nm pax
+.Nm
 will prompt for the pathname of the file or device of the next volume in the
 archive.
 .It Fl i
@@ -460,7 +460,7 @@ For each archive member matching a
 operand or each file matching a
 .Ar file
 operand,
-.Nm pax
+.Nm
 will prompt to
 .Pa /dev/tty
 giving the name of the file, its file mode and its modification time.
@@ -569,7 +569,7 @@ nor the
 .Cm o
 specification character is specified, or the user ID and group ID are not
 preserved for any reason,
-.Nm pax
+.Nm
 will not set the
 .Dv S_ISUID 
 .Em ( setuid )
@@ -578,7 +578,7 @@ and
 .Em ( setgid )
 bits of the file mode.
 If the preservation of any of these items fails for any reason,
-.Nm pax
+.Nm
 will write a diagnostic message to
 .Dv standard error .
 Failure to preserve these items will affect the final exit status,
@@ -636,9 +636,9 @@ File or archive member names that substitute to the empty string
 are not selected and will be skipped.
 .It Fl t
 Reset the access times of any file or directory read or accessed by
-.Nm pax
+.Nm
 to be the same as they were before being read or accessed by
-.Nm pax .
+.Nm Ns .
 .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.
@@ -699,7 +699,7 @@ standard.
 The default blocksize for this format is 5120 bytes.
 Inode and device information about a file (used for detecting file hard links
 by this format) which may be truncated by this format is detected by
-.Nm pax
+.Nm
 and is repaired.
 .It Ar bcpio
 The old binary cpio format.
@@ -708,21 +708,21 @@ This format is not very portable and should not be used when other formats
 are available.
 Inode and device information about a file (used for detecting file hard links
 by this format) which may be truncated by this format is detected by
-.Nm pax
+.Nm
 and is repaired.
 .It Ar sv4cpio
 The System V release 4 cpio.
 The default blocksize for this format is 5120 bytes.
 Inode and device information about a file (used for detecting file hard links
 by this format) which may be truncated by this format is detected by
-.Nm pax
+.Nm
 and is repaired.
 .It Ar sv4crc
 The System V release 4 cpio with file crc checksums.
 The default blocksize for this format is 5120 bytes.
 Inode and device information about a file (used for detecting file hard links
 by this format) which may be truncated by this format is detected by
-.Nm pax
+.Nm
 and is repaired.
 .It Ar tar
 The old BSD tar format as found in BSD4.3.
@@ -790,20 +790,20 @@ archives to
 .Ar limit .
 With a positive
 .Ar limit ,
-.Nm pax
+.Nm
 will attempt to recover from an archive read error and will
 continue processing starting with the next file stored in the archive.
 A
 .Ar limit
 of 0 will cause
-.Nm pax
+.Nm
 to stop operation after the first read error is detected on an archive volume.
 A
 .Ar limit
 of
 .Li NONE
 will cause
-.Nm pax 
+.Nm
 to attempt to recover from read errors forever.
 The default 
 .Ar limit
@@ -813,7 +813,7 @@ is a small positive number of retries.
 Using this option with
 .Li NONE
 should be used with extreme caution as
-.Nm pax
+.Nm
 may get stuck in an infinite loop on a very badly flawed archive.
 .It Fl G Ar group
 Select a file based on its
@@ -857,7 +857,7 @@ only files with a modification or inode change time of exactly that
 time will be selected.
 .Pp
 When
-.Nm pax
+.Nm
 is in the 
 .Em write
 or
@@ -887,7 +887,7 @@ created and had their modification time reset to an older time (as what
 happens when a file is extracted from an archive and the modification time
 is preserved).
 Time comparisons using both file times is useful when
-.Nm pax
+.Nm
 is used to create a time based incremental archive (only files that were
 changed during a specified time range will be archived).
 .Pp
@@ -1093,7 +1093,7 @@ files with the same name found in the source file tree
 .Pa home .
 .Sh STANDARDS
 The
-.Nm pax
+.Nm
 utility is a superset of the
 .St -p1003.2
 standard.
@@ -1125,7 +1125,7 @@ standard.
 .An Keith Muller
 at the University of California, San Diego
 .Sh ERRORS
-.Nm pax
+.Nm Pax
 will exit with one of the following values:
 .Bl -tag -width 2n
 .It 0
@@ -1135,7 +1135,7 @@ An error occurred.
 .El
 .Pp
 Whenever
-.Nm pax
+.Nm
 cannot create a file or a link when reading an archive or cannot
 find a file when writing an archive, or cannot preserve the user ID,
 group ID, or file mode when the
@@ -1144,28 +1144,28 @@ option is specified, a diagnostic message is written to
 .Dv standard error
 and a non-zero exit status will be returned, but processing will continue.
 In the case where pax cannot create a link to a file,
-.Nm pax
+.Nm
 will not create a second copy of the file.
 .Pp
 If the extraction of a file from an archive is prematurely terminated by
 a signal or error,
-.Nm pax
+.Nm
 may have only partially extracted a file the user wanted.
 Additionally, the file modes of extracted files and directories
 may have incorrect file bits, and the modification and access times may be
 wrong.
 .Pp
 If the creation of an archive is prematurely terminated by a signal or error,
-.Nm pax
+.Nm
 may have only partially created the archive which may violate the specific
 archive format specification.
 .Pp
 If while doing a
 .Em copy ,
-.Nm pax
+.Nm
 detects a file is about to overwrite itself, the file is not copied,
 a diagnostic message is written to
 .Dv standard error
 and when
-.Nm pax
+.Nm
 completes it will exit with a non-zero exit status.
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 6bb34bee9cfa..4caecf9ddccb 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -33,8 +33,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: pax.c,v 1.9 1997/08/29 16:12:28 sos Exp $
  */
 
 #ifndef lint
@@ -44,7 +42,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 47aca3d2d7c7..8c9642b6f8ad 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: sel_subs.c,v 1.7 1997/08/29 16:12:29 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 87da13b981ff..11d4d64f4f7b 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: tables.c,v 1.9 1997/08/29 16:12:29 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index c16cdb99f3c5..bde4c459f12d 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: tar.c,v 1.8 1997/08/29 16:12:30 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index afeb1f2e45cf..c8621162f4dc 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: tty_subs.c,v 1.7 1997/08/29 16:12:30 sos Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
+#if 0
+static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 132cc3d970d0..2cb39bfdab21 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: fmt.c,v 1.9 1997/02/22 14:05:00 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
+#if 0
+static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 049a6a271554..46ade5da047a 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: nlist.c,v 1.8 1997/02/22 14:05:04 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index f83865236c8a..5a6a07f89a5e 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: print.c,v 1.23 1997/08/03 08:28:36 peter Exp $
  */
 
 #ifndef lint
-static char const sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
+#if 0
+static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index c550ae48bf80..34a3c6dc207e 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -30,16 +30,16 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: ps.1,v 1.15 1997/12/05 07:35:31 dyson Exp $
+.\"	$Id: ps.1,v 1.16 1998/02/18 22:49:58 dima Exp $
 .\"
 .Dd April 18, 1994
 .Dt PS 1
 .Os BSD 4
 .Sh NAME
-.Nm \&ps
+.Nm ps
 .Nd process status
 .Sh SYNOPSIS
-.Nm \&ps
+.Nm ps
 .Op Fl aCcefhjlmrSTuvwx
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -52,7 +52,7 @@
 .Nm ps
 .Op Fl L
 .Sh DESCRIPTION
-.Nm \&Ps
+.Nm Ps
 displays a header line followed by lines containing information about your
 processes that have controlling terminals.
 This information is sorted by controlling terminal, then by process
@@ -105,13 +105,13 @@ and command.
 .It Fl M
 Extract values associated with the name list from the specified core
 instead of the default
-.Dq Pa /dev/kmem .
+.Pa /dev/kmem .
 .It Fl m
 Sort by memory usage, instead of by process
 .Tn ID .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /kernel .
+.Pa /kernel .
 .It Fl O
 Add the information associated with the space or comma separated list
 of keywords specified, after the process
@@ -165,14 +165,14 @@ option.
 .It Fl W
 Extract swap information from the specified file instead of the
 default
-.Dq Pa /dev/drum .
+.Pa /dev/drum .
 .It Fl w
 Use 132 columns to display information, instead of the default which
 is your window size.
 If the
 .Fl w
 option is specified more than once,
-.Nm \&ps
+.Nm
 will use as many columns as necessary without regard for your window size.
 .It Fl x
 Display information about processes without controlling terminals.
@@ -308,7 +308,7 @@ The process is being traced or debugged.
 .It tt
 An abbreviation for the pathname of the controlling terminal, if any.
 The abbreviation consists of the two letters following
-.Dq Pa /dev/tty ,
+.Pa /dev/tty ,
 or, for the console, ``co''.
 This is followed by a ``-'' if the process can no longer reach that
 controlling terminal (i.e., it has been revoked).
@@ -323,7 +323,7 @@ When printing using the command keyword, a process that has exited and
 has a parent that has not yet waited for the process (in other words, a zombie)
 is listed as ``<defunct>'', and a process which is blocked while trying
 to exit is listed as ``<exiting>''.
-.Nm \&Ps
+.Nm Ps
 makes an educated guess as to the file name and arguments given when the
 process was created by examining memory or the swap area.
 The method is inherently somewhat unreliable and in any event a process
@@ -502,6 +502,6 @@ the mount point of
 .Xr pstat 8
 .Sh BUGS
 Since
-.Nm \&ps
+.Nm
 cannot run faster than the system and is run as any other scheduled
 process, the information it displays can never be exact.
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 2330ce249e48..092256a26f30 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: ps.c,v 1.22 1997/12/05 07:33:40 dyson Exp $
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
+#if 0
+static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index ca900594ac24..39f0d5effa76 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\"	$Id$
+.\"	$Id: pwd.1,v 1.5 1997/02/22 14:05:15 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt PWD 1
@@ -44,14 +44,14 @@
 .Sh SYNOPSIS
 .Nm pwd
 .Sh DESCRIPTION
-.Nm
+.Nm Pwd
 writes the absolute pathname of the current working directory to
 the standard output.
 .Pp
 The pwd utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
-.Nm pwd
+.Nm
 command is expected to be
 .St -p1003.2
 compatible.
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 63b68686406a..fab0dfbd0a42 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: pwd.c,v 1.5 1997/02/22 14:05:16 peter Exp $
  */
 
 #ifndef lint
@@ -40,7 +38,11 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char const sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
+#if 0
+static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <err.h>