release/2.1.6_cvs

author: cvs2svn <cvs2svn@FreeBSD.org> 1997-02-05 04:29:56 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 1997-02-05 04:29:56 +0000
commit: 860c2cf2bc6592828a3468ab8ee661042b059ae8 (patch)
tree: fde30676422ab07fdec2d11fde3fc5693fdbb8cf /bin
parent: b61013aa0c73c687493c80193bc040d29b351fb8 (diff)
265 files changed, 283 insertions, 265 deletions
diff --git a/bin/Makefile b/bin/Makefile
index e2c4bcc8af20..fe9771a5ab92 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/18 21:25:26 wollman Exp $
+#	$Id: Makefile,v 1.2.6.2 1996/06/05 02:35:06 jkh Exp $
 
 SUBDIR=	cat chmod cp csh date dd df domainname echo ed expr hostname \
 	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 4760782bef05..39a3eacd3e1a 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,4 +1,15 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
+#	$Id: Makefile.inc,v 1.4.6.3 1996/11/24 09:30:28 joerg Exp $
 
 BINDIR?=	/bin
 NOSHARED?=	YES
+
+.if exists (${.CURDIR}/../../secure)
+
+.if exists(${.CURDIR}/../../secure/lib/libcipher/obj)
+CIPHEROBJDIR=    ${.CURDIR}/../../secure/lib/libcipher/obj
+.else
+CIPHEROBJDIR=    ${.CURDIR}/../../secure/lib/libcipher
+.endif
+
+.endif
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 6da43b3828af..7f4221e97ac1 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:25 davidg Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 05402f22a73b..c18503459f1a 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	$Id$
+.\"	$Id: cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp $
 .\"
 .Dd June 29, 1993
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 3d3b210cc31f..58f3eb298827 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cat.c,v 1.3 1995/10/03 12:46:37 bde Exp $
+ *	$Id: cat.c,v 1.2.6.1 1995/10/05 07:20:59 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index dc9390bb289f..74c1dec8bd54 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:36 davidg Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 60974ef53363..fcde87dbdab6 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.2 1994/09/24 02:53:37 davidg Exp $
+.\"	$Id: chmod.1,v 1.2.6.1 1996/05/29 22:18:03 jkh Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index c02994df9bd7..979519eb3c1c 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chmod.c,v 1.3 1995/02/03 22:21:09 bde Exp $
+ *	$Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 57883daad0d1..48c253b5153a 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:39 davidg Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index fad0c0acc72e..d8d4e73b0f14 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp $
+.\"	$Id: cp.1,v 1.2.6.2 1996/06/05 02:35:09 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index cfbcd5636f3a..86539e9f8698 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cp.c,v 1.6 1995/05/30 00:06:21 rgrimes Exp $
+ *	$Id: cp.c,v 1.6.4.2 1996/06/05 02:35:10 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index d97d76aa46d6..ae6d4dcd7e43 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.2 1994/09/24 02:53:41 davidg Exp $
+ *	$Id: extern.h,v 1.2.6.2 1996/06/05 02:35:10 jkh Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 0f2c100c6a4b..593335a42b45 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: utils.c,v 1.3.4.2 1995/10/05 07:24:24 davidg Exp $
+ *	$Id: utils.c,v 1.3.4.4 1996/06/05 02:35:11 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 2bf842dde074..bc35a5618775 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.5 1994/09/24 02:53:44 davidg Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
diff --git a/bin/csh/USD.doc/Makefile b/bin/csh/USD.doc/Makefile
index c85e28041507..f0aa8fb0f0fe 100644
--- a/bin/csh/USD.doc/Makefile
+++ b/bin/csh/USD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp $
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 6bc0856b5932..cea97f9b3ef2 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 88711139d362..1cdaccfda339 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index d6e3819c55d9..26fa4963b88c 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.3,v 1.2 1994/09/24 02:54:26 davidg Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 2b2aaa9920a0..941b1c502964 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.4,v 1.2 1994/09/24 02:54:27 davidg Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index f01312a41b94..28b1264f9f74 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.a,v 1.2 1994/09/24 02:54:28 davidg Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index ac27152bccd6..51a600d6f7b7 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.g,v 1.2 1994/09/24 02:54:31 davidg Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 84deab72a15f..e7b6218d397f 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: tabs,v 1.2 1994/09/24 02:54:32 davidg Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 3c4a1869ff41..34b375481cfb 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $
+ *	$Id: alloc.c,v 1.4 1995/05/30 00:06:28 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/char.c b/bin/csh/char.c
index 5e1a1e4a6bc0..ee2679e14dee 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: char.c,v 1.2 1994/09/24 02:53:46 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/char.h b/bin/csh/char.h
index 9fba6f7157bf..133a6ef36639 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: char.h,v 1.2 1994/09/24 02:53:47 davidg Exp $
  */
 
 #include <ctype.h>
diff --git a/bin/csh/const.c b/bin/csh/const.c
index 7a6df42c26a6..c7aa23b08b18 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $
+ *	$Id: const.c,v 1.3.4.2 1996/06/05 02:35:13 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 7f179d85a466..b05102283632 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.3 1995/05/06 13:52:29 ache Exp $
+.\"	$Id: csh.1,v 1.3.4.2 1996/06/05 02:35:14 jkh Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 98a719b9c892..aa573184e7fa 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: csh.c,v 1.3.4.1 1995/08/25 02:55:47 davidg Exp $
+ *	$Id: csh.c,v 1.3.4.3 1996/06/05 02:35:15 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index 290262f5ca82..b58040d5944c 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: csh.h,v 1.2 1994/09/24 02:53:52 davidg Exp $
  */
 
 /*
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 4f8c44fc8460..e8fe9b7b9785 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
+ *	$Id: dir.c,v 1.3.4.1 1995/08/25 02:57:08 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/dir.h b/bin/csh/dir.h
index ec57104831cf..582390140711 100644
--- a/bin/csh/dir.h
+++ b/bin/csh/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: dir.h,v 1.2 1994/09/24 02:53:55 davidg Exp $
  */
 
 /*
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index 276ea2b59c13..7d5169ec9e42 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $
+ *	$Id: dol.c,v 1.3 1995/05/30 00:06:31 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/err.c b/bin/csh/err.c
index 77ae9e055b97..b683309fe31f 100644
--- a/bin/csh/err.c
+++ b/bin/csh/err.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: err.c,v 1.2 1994/09/24 02:53:57 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index d7750733a7fa..53a91b7bba2f 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $
+ *	$Id: exec.c,v 1.3.4.1 1995/08/25 02:58:40 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index ff484ce405df..eddc3956a6b4 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: exp.c,v 1.2 1994/09/24 02:54:00 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index f9ebd99aabe6..a0cb188924c7 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:02 davidg Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 639e09c00029..73b5d4f804b5 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $
+ *	$Id: file.c,v 1.3.4.1 1995/08/25 03:01:01 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/func.c b/bin/csh/func.c
index cdf191659309..5f4e4465e34f 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: func.c,v 1.3 1995/05/30 00:06:34 rgrimes Exp $
+ *	$Id: func.c,v 1.3.4.2 1996/06/05 02:35:16 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 2dd0895911dc..e5e16a5d51d3 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glob.c,v 1.2 1994/09/24 02:54:05 davidg Exp $
+ *	$Id: glob.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index c90dd66565a5..c92b7cb20757 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: hist.c,v 1.2 1994/09/24 02:54:06 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/init.c b/bin/csh/init.c
index cee64c6f6477..d15faaf9f66e 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: init.c,v 1.2 1994/09/24 02:54:07 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 940ccaedadab..3fc7d64e389d 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
+ *	$Id: lex.c,v 1.3.4.1 1995/08/25 03:02:28 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 79d2f9034403..07f4c7d5e5f9 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index 5d0632e092b7..dad3d96f6366 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $
+ *	$Id: parse.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/pathnames.h b/bin/csh/pathnames.h
index f1cf072c4a05..359e7d6ca6b1 100644
--- a/bin/csh/pathnames.h
+++ b/bin/csh/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: pathnames.h,v 1.2 1994/09/24 02:54:12 davidg Exp $
  */
 
 #define	_PATH_BIN		"/bin"
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index d70d29ffc4e4..90e0250a8233 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: proc.c,v 1.2 1994/09/24 02:54:13 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/proc.h b/bin/csh/proc.h
index c621a742787f..b62ad57b7f81 100644
--- a/bin/csh/proc.h
+++ b/bin/csh/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: proc.h,v 1.2 1994/09/24 02:54:14 davidg Exp $
  */
 
 /*
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 8216d5590d2a..64e6d1b25ff2 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $
+ *	$Id: sem.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/set.c b/bin/csh/set.c
index f1b5532c0f00..233c868c8eaf 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $
+ *	$Id: set.c,v 1.3.4.1 1995/08/25 02:55:49 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/str.c b/bin/csh/str.c
index d30b95ef7bad..dc76df52f559 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $
+ *	$Id: str.c,v 1.3 1995/05/30 00:06:39 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/csh/time.c b/bin/csh/time.c
index 95de7d2b444b..10a9daae1e44 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $
+ *	$Id: time.c,v 1.5 1995/05/30 00:06:40 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 294aae0cc99b..72e6369dd62e 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:33 davidg Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index e8946017864c..306a571ec2cc 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.5.4.1 1995/08/28 10:33:04 davidg Exp $
+.\"	$Id: date.1,v 1.5.4.2 1996/03/12 05:32:12 nate Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index af348ee15a92..dc6470d916b6 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: date.c,v 1.4.4.1 1995/08/28 10:31:25 davidg Exp $
+ *	$Id: date.c,v 1.4.4.3 1996/06/05 02:35:18 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/date/extern.h b/bin/date/extern.h
index c21fdc63d0b2..560d2a9b4d16 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:37 davidg Exp $
  */
 
 int	netsettime __P((time_t));
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 0f12aae5ddf5..08f6de731670 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: netdate.c,v 1.2 1994/09/24 02:54:38 davidg Exp $
+ *	$Id: netdate.c,v 1.3 1995/05/30 00:06:41 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 09158e5a81c0..4ddbc0c41b96 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:40 davidg Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 61b479451826..d2268dcf83c0 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: args.c,v 1.3 1994/09/24 02:54:42 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index e87c396440da..295d88b749fa 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: conv.c,v 1.3 1994/09/24 02:54:44 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 2fb2bc6ec706..3a617ae475f2 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $
+ *	$Id: conv_tab.c,v 1.3 1995/01/17 23:04:28 ache Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 03897fb96c74..9fa49873c91b 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\"	$Id: dd.1,v 1.2 1994/09/24 02:54:49 davidg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 89f3d3a207f0..613d98f79055 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dd.c,v 1.4 1995/01/17 23:04:29 ache Exp $
+ *	$Id: dd.c,v 1.4.4.2 1996/06/05 02:35:21 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index 4ad97473e25d..45c221112257 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: dd.h,v 1.2 1994/09/24 02:54:54 davidg Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 7445fee4b083..192ca82e1543 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:57 davidg Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index a135c85496a7..3d9a1c558299 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/dd/position.c b/bin/dd/position.c
index c50102241c99..6062a9d4283f 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: position.c,v 1.2 1994/09/24 02:55:03 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 302345204967..4f94ca71a1d5 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:06 davidg Exp $
 
 PROG=	df
 BINGRP=	operator
diff --git a/bin/df/df.1 b/bin/df/df.1
index 4337ac1bc0d0..f1f6b359b2f7 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\"	$Id: df.1,v 1.3 1994/09/24 02:55:08 davidg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index 24e0442ef063..f93c06f1ae7a 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.7.4.2 1996/06/05 02:35:24 jkh Exp $
+ *	$Id: df.c,v 1.7.4.3 1996/06/11 04:38:08 bde Exp $
  */
 
 #ifndef lint
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 8274b61c0ad6..b54c69ab7911 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1994/09/18 21:23:35 wollman Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 782e708edac6..24ae17d3b4a0 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.1 1994/09/18 21:23:36 wollman Exp $
+.\"	$Id: domainname.1,v 1.2 1995/01/14 17:02:33 ats Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 4295ec5bff27..335b5d77b85f 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
 static const char rcsid[] =
-	"$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $";
+	"$Id: domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index c296871792c5..b562b331c319 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:15 davidg Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index e97ac08c837c..93ed1fdb7ac7 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
+.\"	$Id: echo.1,v 1.2.6.2 1996/06/05 02:35:27 jkh Exp $
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index e12f0a6e9ee9..249ed1782d46 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ *	$Id: echo.c,v 1.2.6.2 1996/06/05 02:35:30 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 7da27f20079f..8ec24393675d 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,8 +1,15 @@
-#	$Id: Makefile,v 1.10 1994/12/18 15:15:10 jkh Exp $
+#	$Id: Makefile,v 1.10.4.3 1996/11/24 09:31:31 joerg Exp $
 
 PROG=	ed
-SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=  ${BINDIR}/ed ${BINDIR}/red
 MLINKS= ed.1 red.1
 
+.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+DISTRIBUTION=des
+CFLAGS+=-DDES
+LDADD+= -L${CIPHEROBJDIR} -lcipher
+DPADD+= ${CIPHEROBJDIR}/libcipher.a
+.endif
+
 .include <bsd.prog.mk>
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index db1a155e2cf2..179ce3d58fc1 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$Id$
+$Id: POSIX,v 1.4 1994/09/24 02:55:20 davidg Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 322e65e0fcaf..9988a30353f2 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$Id$
+$Id: README,v 1.4 1994/09/24 02:55:21 davidg Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index e14a65c59730..a6ec5244ee76 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.6 1994/09/24 02:55:22 davidg Exp $
+ *	$Id: buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp $
  */
 #ifndef lint
 static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 62fcd9909275..e41629832c54 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.4 1994/09/24 02:55:24 davidg Exp $
+ *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index e650e3c4b58c..f8a4e6da4890 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: ed.1,v 1.6 1994/09/24 02:55:24 davidg Exp $
 .TH ED 1 "21 May 1993"
 .SH NAME
 .\" ed, red \- text editor
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 629651642cd0..0f8164edddc6 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
+ *	$Id: ed.h,v 1.8 1994/11/03 21:46:55 davidg Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index b9856c3e6654..a124e5b779c4 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $
+ *	$Id: glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/io.c b/bin/ed/io.c
index f4b4f76ba17a..5bf36eb6e484 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
+ *	$Id: io.c,v 1.4.4.2 1996/06/05 02:35:35 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 01f30e52d046..dc6b1662f80c 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.4 1995/03/19 13:28:34 joerg Exp $
+ *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 252e8f8678d9..847b774649e9 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $
+ *	$Id: re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index c61c7e4e196c..e571d7ec877f 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $
+ *	$Id: sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index 9f10e1e3c225..da19e499659d 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $
 
 SHELL=	/bin/sh
 ED=	../obj/ed
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index ec813c2d5c7d..1fdad02cd5c6 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: undo.c,v 1.3 1994/09/24 02:55:32 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 71cf46a00383..6a98fd946325 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,5 +1,5 @@
 #	/b/source/CVS/src/bin/expr/Makefile,v 1.5 1993/06/14 19:56:06 jtc Exp
-#	$Id: Makefile,v 1.7 1995/05/30 00:06:49 rgrimes Exp $
+#	$Id: Makefile,v 1.7.4.2 1996/06/05 02:35:37 jkh Exp $
 
 PROG=		expr
 SRCS=		expr.c
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index c1c1d37d801a..d1559ad06f13 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -28,7 +28,7 @@
 .\" (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: expr.1,v 1.3 1994/04/24 01:18:46 jkh Exp $
+.\"	$Id: expr.1,v 1.3.6.1 1996/01/30 13:59:02 mpp Exp $
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 931bf276a4a4..66647489442c 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $Id: expr.y,v 1.11 1995/11/18 18:05:03 joerg Exp $
+ * $Id: expr.y,v 1.9.4.2 1995/12/11 22:59:22 joerg Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index adee034af686..a6eb65fa99e3 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:39 davidg Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 4a3caa770482..943743702abc 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: hostname.1,v 1.2.6.2 1996/06/05 02:35:38 jkh Exp $
+.\"	$Id: hostname.1,v 1.2.6.3 1996/06/27 05:31:00 gpalmer Exp $
 .\"
 .Dd May 31, 1993
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 00408ecdd353..74e362473a22 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: hostname.c,v 1.2 1994/09/24 02:55:40 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 610341f6b8c1..686167e3f254 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:42 davidg Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 0795098d8aa0..c18ede2509d9 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: kill.1,v 1.2 1994/09/24 02:55:43 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 7de25e157206..814885f8d4f2 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kill.c,v 1.2 1994/09/24 02:55:44 davidg Exp $
+ *	$Id: kill.c,v 1.3 1995/03/05 21:52:41 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index 83a6e1dca2f1..77d66645eccb 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.3 1994/09/24 02:55:45 davidg Exp $
 
 PROG=	ln
 MAN1=	ln.1
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 2e1337376f53..98522bcea3fd 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\"	$Id: ln.1,v 1.2 1994/09/24 02:55:47 davidg Exp $
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 69ae926cabce..124668e00f91 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ln.c,v 1.5 1994/12/06 18:50:44 bde Exp $
+ *	$Id: ln.c,v 1.5.4.2 1996/06/05 02:35:39 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 1fb4ea41bfdb..94b5396cf706 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\"	$Id$
+.\"	$Id: symlink.7,v 1.2 1994/09/24 02:55:49 davidg Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index d1a6b6b84384..262c5d6892d2 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:51 davidg Exp $
 
 PROG=	ls
 SRCS=	cmp.c stat_flags.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 51397b45c390..2327abb223df 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cmp.c,v 1.2 1994/09/24 02:55:52 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 253d50642d4a..34cd71ce7ece 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:55:52 davidg Exp $
  */
 
 int	 acccmp __P((const FTSENT *, const FTSENT *));
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 49fa38edb8ea..213d4fc575e8 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.6 (Berkeley) 4/18/94
-.\"	$Id: ls.1,v 1.4 1995/09/26 08:48:09 mpp Exp $
+.\"	$Id: ls.1,v 1.3.6.1 1995/10/05 07:28:28 davidg Exp $
 .\"
 .Dd April 18, 1994
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index c125d678e543..d9074d38634d 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ls.c,v 1.6 1995/03/23 19:05:00 phk Exp $
+ *	$Id: ls.c,v 1.6.4.2 1996/06/05 02:35:41 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 61c319e9c187..4f34ba812721 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ls.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: ls.h,v 1.2 1994/09/24 02:55:55 davidg Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 54e76bbfa8d5..647f14eb6ca9 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.4.4.1 1995/08/28 10:30:27 davidg Exp $
+ *	$Id: print.c,v 1.4.4.3 1996/06/05 02:35:42 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ls/stat_flags.c b/bin/ls/stat_flags.c
index d62a0fd42e0d..d3f335e4936f 100644
--- a/bin/ls/stat_flags.c
+++ b/bin/ls/stat_flags.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: stat_flags.c,v 1.2 1994/09/24 02:55:57 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 12679945cc8f..bbba1f928e8c 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.4 1994/10/09 15:25:23 ache Exp $
+ *	$Id: util.c,v 1.4.6.2 1996/06/05 02:35:42 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index 03ca565911e9..a1ba4a55bb85 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:56:01 davidg Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 4627b8a68dd3..7e9a00322fb1 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\"	$Id$
+.\"	$Id: mkdir.1,v 1.2 1994/09/24 02:56:02 davidg Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index d5fe7e516649..1a6053b524ec 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mkdir.c,v 1.5 1994/09/24 02:56:03 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 0ba523e61b44..d5f89c6df6a8 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:56:05 davidg Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index c79f74a3271c..12a3b943599f 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.2.6.1 1995/08/29 11:14:21 davidg Exp $
+.\"	$Id: mv.1,v 1.2.6.3 1996/06/05 02:35:44 jkh Exp $
 .\"
 .Dd May 31, 1993
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 41c71bd12b4f..cfbd7de2085f 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mv.c,v 1.2.6.1 1995/10/09 05:12:21 davidg Exp $
+ *	$Id: mv.c,v 1.2.6.3 1996/06/05 02:35:45 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
index 4adf62b4ec5f..3ca9f6442c8e 100644
--- a/bin/mv/pathnames.h
+++ b/bin/mv/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: pathnames.h,v 1.2 1994/09/24 02:56:08 davidg Exp $
  */
 
 #define	_PATH_RM	"/bin/rm"
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index cd0cc2d82e4c..eef5d60a121a 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:56:10 davidg Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 9bf75662f15d..caa8761d059f 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_io.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $
+ *	$Id: ar_io.c,v 1.3.4.2 1996/06/05 02:35:47 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 79cbe0338a9a..d9d76051e2fc 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_subs.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $
+ *	$Id: ar_subs.c,v 1.3.4.2 1996/06/05 02:35:48 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 1cca4138b270..f2321de5e173 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf_subs.c,v 1.3 1995/05/30 00:06:53 rgrimes Exp $
+ *	$Id: buf_subs.c,v 1.3.4.2 1996/06/05 02:35:49 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 5e8770fd70b5..05d4096376f9 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cache.c,v 1.2 1994/09/24 02:56:14 davidg Exp $
+ *	$Id: cache.c,v 1.2.6.2 1996/06/05 02:35:50 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 5c01ef410aef..2be117544b8d 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: cache.h,v 1.2 1994/09/24 02:56:15 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index f0b0586e7a33..f48bb5c88d20 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpio.c,v 1.3 1995/05/30 00:06:54 rgrimes Exp $
+ *	$Id: cpio.c,v 1.3.4.2 1996/06/05 02:35:51 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 6e500487f550..a3a174f02bcf 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- *	$Id: cpio.h,v 1.2 1994/09/24 02:56:17 davidg Exp $
+ *	$Id: cpio.h,v 1.3 1995/05/30 00:06:55 rgrimes Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 819329f2c2b8..b95d88a6af2c 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:56:18 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index e8c6fd345d58..eeb415f2893a 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file_subs.c,v 1.3 1995/05/30 00:06:56 rgrimes Exp $
+ *	$Id: file_subs.c,v 1.3.4.2 1996/06/05 02:35:52 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 36bdecf6ba35..ee463bedff58 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftree.c,v 1.3 1995/05/30 00:06:57 rgrimes Exp $
+ *	$Id: ftree.c,v 1.3.4.2 1996/06/05 02:35:53 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index a98654632f54..ca456c1205a2 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: ftree.h,v 1.2 1994/09/24 02:56:21 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 8fb957514b5d..a6c70914ad5e 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gen_subs.c,v 1.4.4.1 1995/08/28 10:41:14 davidg Exp $
+ *	$Id: gen_subs.c,v 1.4.4.3 1996/06/05 02:35:54 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/options.c b/bin/pax/options.c
index da5229829a06..468e9d070e59 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.3 1995/03/19 13:28:53 joerg Exp $
+ *	$Id: options.c,v 1.3.4.2 1996/06/05 02:35:55 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/options.h b/bin/pax/options.h
index df1bd7daac41..675a78c9af24 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ *	$Id: options.h,v 1.2 1994/09/24 02:56:24 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 6c43f37ab191..e5fdc20b6dc6 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pat_rep.c,v 1.4 1995/05/30 00:06:59 rgrimes Exp $
+ *	$Id: pat_rep.c,v 1.4.4.2 1996/06/05 02:35:56 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index e994a33cb6ed..ee5165496547 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: pat_rep.h,v 1.2 1994/09/24 02:56:25 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 8fe6b49538a2..a8b748368ef5 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.3 1995/08/16 23:12:25 nate Exp $
+.\"	$Id: pax.1,v 1.2.6.1 1995/08/29 11:46:20 davidg Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 6b9ee71d8ee6..26f272ebb960 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pax.c,v 1.3 1995/05/30 00:07:00 rgrimes Exp $
+ *	$Id: pax.c,v 1.3.4.2 1996/06/05 02:35:57 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index d6fe02c26c18..5109fff39a3a 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- *	$Id: pax.h,v 1.3 1995/05/30 00:07:01 rgrimes Exp $
+ *	$Id: pax.h,v 1.3.4.1 1995/08/25 03:15:56 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 2af13397a5af..f42036d8d101 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sel_subs.c,v 1.2 1994/09/24 02:56:29 davidg Exp $
+ *	$Id: sel_subs.c,v 1.2.6.2 1996/06/05 02:35:58 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index dbab257b3e83..01acd79221cc 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: sel_subs.h,v 1.2 1994/09/24 02:56:31 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 5cc749d9dd93..d8fa2789e895 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tables.c,v 1.3 1995/05/30 00:07:01 rgrimes Exp $
+ *	$Id: tables.c,v 1.3.4.2 1996/06/05 02:35:59 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index d7ff769fdb9b..3596a3599974 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- *	$Id: tables.h,v 1.2 1994/09/24 02:56:35 davidg Exp $
+ *	$Id: tables.h,v 1.3 1995/05/30 00:07:02 rgrimes Exp $
  */
 
 /*
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 48a6ebfda0b9..2da698802ab3 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tar.c,v 1.3 1995/05/30 00:07:03 rgrimes Exp $
+ *	$Id: tar.c,v 1.3.4.2 1996/06/05 02:36:00 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 5533a0777e6d..f9b7db8f5aab 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ *	$Id: tar.h,v 1.2 1994/09/24 02:56:38 davidg Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index ef507c1808da..a205e5e35f5e 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tty_subs.c,v 1.2 1994/09/24 02:56:38 davidg Exp $
+ *	$Id: tty_subs.c,v 1.2.6.2 1996/06/05 02:36:01 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index dea0ff4e821d..c71bbbe057df 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-#	$Id: Makefile,v 1.5 1995/04/15 03:31:19 davidg Exp $
+#	$Id: Makefile,v 1.5.4.2 1996/06/05 02:36:06 jkh Exp $
 
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c
diff --git a/bin/ps/devname.c b/bin/ps/devname.c
index 0aedb2b293be..cce23d14ef33 100644
--- a/bin/ps/devname.c
+++ b/bin/ps/devname.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: devname.c,v 1.2 1994/09/24 02:56:41 davidg Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 173ddf33c3ac..305513b17a28 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:56:42 davidg Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 23d6adb6acc4..d660843394a5 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fmt.c,v 1.5 1995/03/09 20:40:17 davidg Exp $
+ *	$Id: fmt.c,v 1.5.4.2 1996/06/05 02:36:08 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 3b2f5a3bdc7c..acb90c787b24 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: keyword.c,v 1.5.6.1 1995/10/05 07:46:36 davidg Exp $
+ *	$Id: keyword.c,v 1.5.6.3 1996/06/05 02:36:10 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 293a6273aaf0..b41ecd4e4f78 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nlist.c,v 1.4 1994/10/02 08:33:29 davidg Exp $
+ *	$Id: nlist.c,v 1.5 1994/11/24 13:13:55 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/print.c b/bin/ps/print.c
index be2a4d089a4a..49290f99ef46 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.7.4.2 1995/10/05 07:46:37 davidg Exp $
+ *	$Id: print.c,v 1.7.4.4 1996/06/05 02:36:11 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 250df97815cf..ae6ba8d2c912 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: ps.1,v 1.4.6.2 1996/02/22 19:51:39 peter Exp $
+.\"	$Id: ps.1,v 1.4.6.4 1996/06/05 02:36:11 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 0fe890abce87..a121d95aa37e 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ps.c,v 1.7.4.1 1996/02/22 19:51:40 peter Exp $
+ *	$Id: ps.c,v 1.7.4.3 1996/06/05 02:36:12 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index d1b84333ec01..3f5ed2b9aee2 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: ps.h,v 1.2 1994/09/24 02:56:48 davidg Exp $
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4937fb391932..ef1af5ed6877 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:56:50 davidg Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index d340aa7522a9..03cd35c3fe10 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: pwd.1,v 1.2 1994/09/24 02:56:51 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 4cb2d1923e7f..5fa2d77e079d 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: pwd.c,v 1.2 1994/09/24 02:56:52 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 06e2fe0bd260..bf37d058a3da 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.4 1994/09/29 13:06:00 csgr Exp $
+#	$Id: Makefile,v 1.5 1994/11/20 23:18:15 wollman Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index ef055c4c7f47..ce959acd4ec0 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:56:54 davidg Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h
index 39158f0d49ca..41ef6b9bc690 100644
--- a/bin/rcp/pathnames.h
+++ b/bin/rcp/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: pathnames.h,v 1.2 1994/09/24 02:56:55 davidg Exp $
  */
 
 #include <paths.h>
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 67f1167e975d..48d608068697 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: rcp.1,v 1.2 1994/09/24 02:56:56 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 994a455e78f5..90399f9cc494 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rcp.c,v 1.4.4.2 1996/06/05 02:36:15 jkh Exp $
+ *	$Id: rcp.c,v 1.4.4.3 1996/06/23 13:07:37 markm Exp $
  */
 
 #ifndef lint
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 099d2f9f2a54..af356d7f8a70 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.3 1995/03/19 13:29:16 joerg Exp $
+ *	$Id: util.c,v 1.4 1995/05/30 00:07:07 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index b7e1d5894cb9..9a534293f246 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:56:59 davidg Exp $
+#	$Id: Makefile,v 1.3 1995/04/13 13:35:07 ache Exp $
 
 PROG=	rm
 SRCS=   rm.c stat_flags.c
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 31aba2cfe6ce..d2b91be3e977 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: rm.1,v 1.2 1994/09/24 02:57:00 davidg Exp $
+.\"	$Id: rm.1,v 1.2.6.2 1996/06/05 02:36:16 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index ffe565505241..7f1aa9a8f9af 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rm.c,v 1.6 1995/04/13 13:35:09 ache Exp $
+ *	$Id: rm.c,v 1.6.4.2 1996/06/05 02:36:17 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index ca3c69c2ea1d..f118add14676 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.3 1994/09/24 02:57:03 davidg Exp $
+#	$Id: Makefile,v 1.4 1995/03/05 08:27:14 joerg Exp $
 
 PROG=	rmail
 MAN8=	rmail.8
diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8
index 859a3c55c9b8..b7a5be096855 100644
--- a/bin/rmail/rmail.8
+++ b/bin/rmail/rmail.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmail.8	6.10 (Berkeley) 4/29/93
-.\"	$Id$
+.\"	$Id: rmail.8,v 1.2 1994/09/24 02:57:04 davidg Exp $
 .\"
 .Dd April 29, 1993
 .Dt RMAIL 8
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index d3f6221a211f..ba92f0a78da9 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rmail.c,v 1.5 1995/05/30 00:07:08 rgrimes Exp $
+ *	$Id: rmail.c,v 1.5.4.2 1996/06/05 02:36:19 jkh Exp $
  */
 
 #ifndef lint
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index 4bedbff9d478..76befda8dcf1 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:57:09 davidg Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 7b2ddf7cd4a4..02ab22befb5c 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: rmdir.1,v 1.2 1994/09/24 02:57:11 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index e47cbb2bdba1..6bd13df3dcd7 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: rmdir.c,v 1.2 1994/09/24 02:57:13 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index cf591a60e4ac..7d5d556eaba1 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.7.6.3 1996/06/05 02:36:21 jkh Exp $
+#	$Id: Makefile,v 1.7.6.4 1996/06/25 14:37:44 joerg Exp $
 
 PROG=	sh
 SRCS=	alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 23925e4fa312..d026868ec9ff 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: TOUR,v 1.2 1994/09/24 02:57:19 davidg Exp $
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index c851287a4643..e37f70332cb1 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alias.c,v 1.2 1994/09/24 02:57:20 davidg Exp $
+ *	$Id: alias.c,v 1.3 1995/05/30 00:07:10 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index b5fed8dd50dd..cbb98c94a8f7 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: alias.h,v 1.2 1994/09/24 02:57:20 davidg Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index b71be6ba639a..53aefa58d00c 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -74,7 +74,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: arith.y,v 1.2 1994/09/24 02:57:21 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index c50463f56815..9c3b851c4dff 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: arith_lex.l,v 1.2 1994/09/24 02:57:22 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index ee25eba9c14b..bbd5099b1598 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.1 (Berkeley) 5/31/93
- *	$Id: bltin.h,v 1.2.6.1 1995/12/11 23:05:26 joerg Exp $
+ *	$Id: bltin.h,v 1.2.6.3 1996/06/05 02:36:24 jkh Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 435b85131a08..81ac89b84831 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: echo.1,v 1.2 1994/09/24 02:58:27 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index f9f1928aa68b..121ab23f8129 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.1 (Berkeley) 5/31/93
- *	$Id: echo.c,v 1.2 1994/09/24 02:58:29 davidg Exp $
+ *	$Id: echo.c,v 1.2.6.1 1995/08/30 05:44:18 davidg Exp $
  */
 
 /*
diff --git a/bin/sh/builtins b/bin/sh/builtins
index a636390256d7..246a888b5e46 100755
--- a/bin/sh/builtins
+++ b/bin/sh/builtins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins	8.1 (Berkeley) 5/31/93
-#	$Id: builtins,v 1.3 1995/10/19 18:42:09 joerg Exp $
+#	$Id: builtins,v 1.2.6.1 1995/12/11 23:04:41 joerg Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 4b9880135a17..476f82781c32 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cd.c,v 1.5 1995/11/14 01:04:52 peter Exp $
+ *	$Id: cd.c,v 1.4.4.1 1995/12/11 23:04:43 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/errmsg.c b/bin/sh/errmsg.c
index 87a8d0cd1bdf..00fef65d2950 100644
--- a/bin/sh/errmsg.c
+++ b/bin/sh/errmsg.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: errmsg.c,v 1.2 1994/09/24 02:57:26 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/errmsg.h b/bin/sh/errmsg.h
index 209094a3843d..34dc6c28035c 100644
--- a/bin/sh/errmsg.h
+++ b/bin/sh/errmsg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errmsg.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: errmsg.h,v 1.2 1994/09/24 02:57:26 davidg Exp $
  */
 
 #define E_OPEN 01
diff --git a/bin/sh/error.c b/bin/sh/error.c
index c1c3b826eba7..4bce4a565cca 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: error.c,v 1.2 1994/09/24 02:57:27 davidg Exp $
+ *	$Id: error.c,v 1.3 1995/05/30 00:07:10 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 03a2f89c56e1..cbb76f4cda39 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: error.h,v 1.2 1994/09/24 02:57:28 davidg Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 34417df5f3c1..8b4405e6d54b 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eval.c,v 1.3 1995/05/30 00:07:11 rgrimes Exp $
+ *	$Id: eval.c,v 1.3.4.1 1995/09/20 08:34:47 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 6d64449599f9..53aa5755915e 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: eval.h,v 1.2 1994/09/24 02:57:31 davidg Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index e9061e8b1879..169e0f528661 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.c,v 1.3 1994/09/24 02:57:32 davidg Exp $
+ *	$Id: exec.c,v 1.4 1995/05/30 00:07:12 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 90d91003ae33..60500ca248d2 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: exec.h,v 1.2 1994/09/24 02:57:33 davidg Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index a5d69ce9672d..50779276fb94 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: expand.c,v 1.3 1995/03/01 13:04:15 guido Exp $
+ *	$Id: expand.c,v 1.4 1995/05/30 00:07:13 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 6af4360abe16..efc75f12791e 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: expand.h,v 1.2 1994/09/24 02:57:35 davidg Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index cacb5ba65c51..9ddddffc12ee 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: cmv,v 1.2 1994/09/24 02:58:33 davidg Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index fe70c6856c70..b6a02c3facdf 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: dirs,v 1.2 1994/09/24 02:58:34 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index f3489b5efe3c..5578ca45b1f0 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: kill,v 1.2 1994/09/24 02:58:36 davidg Exp $
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index f44d3a593d78..b4e2747d3871 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: login,v 1.2 1994/09/24 02:58:38 davidg Exp $
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index fc02baacd0fa..ba38f221157f 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: newgrp,v 1.2 1994/09/24 02:58:40 davidg Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index 938aabc2b702..b6c198e2a8c5 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: popd,v 1.2 1994/09/24 02:58:41 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index 879ae207c111..f4c3b389002f 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: pushd,v 1.2 1994/09/24 02:58:43 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index 3a0735c21856..6c776c296a40 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: suspend,v 1.2 1994/09/24 02:58:44 davidg Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 9cf8a2305957..5801038a391c 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: histedit.c,v 1.3 1995/05/05 06:34:13 davidg Exp $
+ *	$Id: histedit.c,v 1.4 1995/05/30 00:07:14 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 8466409e46f2..b603dc5c86ff 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: init.h,v 1.2 1994/09/24 02:57:37 davidg Exp $
  */
 
 #ifdef __STDC__
diff --git a/bin/sh/input.c b/bin/sh/input.c
index db39b973ef27..2dc7ecb773f0 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: input.c,v 1.4 1995/11/03 18:50:14 peter Exp $
+ *	$Id: input.c,v 1.3.4.1 1995/12/11 23:04:46 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 77b193b81c6a..a7677726a8c8 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: input.h,v 1.2 1994/09/24 02:57:40 davidg Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index ebc1d3d59595..5aded576f359 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: jobs.c,v 1.4 1995/09/21 13:24:20 bde Exp $
+ *	$Id: jobs.c,v 1.3.4.1 1995/10/01 06:08:43 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index fd0802383377..8f70b5b5151d 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: jobs.h,v 1.2 1994/09/24 02:57:42 davidg Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h
index 97d82a952a72..85dbe48761e3 100644
--- a/bin/sh/machdep.h
+++ b/bin/sh/machdep.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)machdep.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: machdep.h,v 1.2 1994/09/24 02:57:43 davidg Exp $
  */
 
 /*
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index a122c9bd0961..61b0bda91578 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mail.c,v 1.2 1994/09/24 02:57:44 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index d7b4fe3e4c02..ae2f617f83ae 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: mail.h,v 1.2 1994/09/24 02:57:45 davidg Exp $
  */
 
 #ifdef __STDC__
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 9d451d4cc09c..b3cafd26c9d6 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.2 1994/09/24 02:57:48 davidg Exp $
+ *	$Id: main.c,v 1.3 1995/05/30 00:07:18 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/main.h b/bin/sh/main.h
index b43f04108575..6158883ecb28 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: main.h,v 1.2 1994/09/24 02:57:49 davidg Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 873e30c8d6b4..45104314da3b 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: memalloc.c,v 1.2 1994/09/24 02:57:50 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index 43f3335567ee..1fff3da8749c 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: memalloc.h,v 1.2 1994/09/24 02:57:51 davidg Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 447d759af856..eab81e06b5c2 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: miscbltin.c,v 1.4 1995/10/21 00:47:30 joerg Exp $
+ *	$Id: miscbltin.c,v 1.2.6.1 1995/12/11 23:04:50 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index e7f0d8dbbdf2..a1fca5c5e13e 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.1 (Berkeley) 5/31/93
-#	$Id: mkbuiltins,v 1.2 1994/09/24 02:57:53 davidg Exp $
+#	$Id: mkbuiltins,v 1.3 1995/03/30 19:45:20 phk Exp $
 
 temp=/tmp/ka$$
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index fc71cdb9cdbe..387268c620e7 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mkinit.c,v 1.5 1995/10/01 15:13:31 joerg Exp $
+ *	$Id: mkinit.c,v 1.4.4.1 1995/10/02 07:55:17 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 5ede3af9cef0..1c08d1487ab6 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mknodes.c,v 1.2 1994/09/24 02:57:55 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mksignames.c b/bin/sh/mksignames.c
index 5d7b9da253c1..a348dcd6bff6 100644
--- a/bin/sh/mksignames.c
+++ b/bin/sh/mksignames.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mksignames.c,v 1.2 1994/09/24 02:57:56 davidg Exp $
+ *	$Id: mksignames.c,v 1.3 1995/05/30 00:07:20 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index b55545c20e32..45cd1535ed39 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mksyntax.c,v 1.2 1994/09/24 02:57:57 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 12983e846be4..e37c4505108b 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: mktokens,v 1.2 1994/09/24 02:57:58 davidg Exp $
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index c08951117ba1..7d9d9de748a0 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: myhistedit.h,v 1.2 1994/09/24 02:57:59 davidg Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 01b1add01abc..62d96644257c 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mystring.c,v 1.2 1994/09/24 02:57:59 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index ca04daab2543..419df4487b97 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: mystring.h,v 1.2 1994/09/24 02:58:00 davidg Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index e0602ed69ddb..c22a80611dd8 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: nodes.c.pat,v 1.2 1994/09/24 02:58:02 davidg Exp $
  */
 
 /*
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index 5f33a1703e49..ee1037276b36 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: nodetypes,v 1.2 1994/09/24 02:58:03 davidg Exp $
 
 # This file describes the nodes used in parse trees.  Unindented lines
 # contain a node type followed by a structure tag.  Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 889715a6a60b..86307f2b75b3 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.3.4.2 1995/10/02 07:55:18 davidg Exp $
+ *	$Id: options.c,v 1.3.4.3 1995/10/10 01:04:38 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 095dc29c3f04..532f07354ee6 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: options.h,v 1.2 1994/09/24 02:58:05 davidg Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 914df67eb387..fd51672bcd31 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: output.c,v 1.2 1994/09/24 02:58:06 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/output.h b/bin/sh/output.h
index e4318f3cacb1..032cd2d8b4f3 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: output.h,v 1.2 1994/09/24 02:58:08 davidg Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 0720e01c5329..4600e8adbec5 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: parser.c,v 1.6.4.4 1996/06/05 02:36:22 jkh Exp $
+ *	$Id: parser.c,v 1.6.4.5 1996/06/25 14:37:46 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 7408bd7a340c..6991a7aee7be 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: parser.h,v 1.2 1994/09/24 02:58:09 davidg Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index c1e7fbc59d1d..4782d43480c9 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: redir.c,v 1.4 1995/10/21 00:47:31 joerg Exp $
+ *	$Id: redir.c,v 1.3.4.1 1995/12/11 23:04:53 joerg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 05842bba5137..ded09f773f68 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: redir.h,v 1.2 1994/09/24 02:58:11 davidg Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 5a02b36796bc..771bca648051 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sh.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: sh.1,v 1.5 1995/10/21 00:47:32 joerg Exp $
+.\"	$Id: sh.1,v 1.3.4.1 1995/12/11 23:04:55 joerg Exp $
 .\"
 .\"
 .\"
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index d038f91b81f0..5f77da3004b2 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.1 (Berkeley) 5/31/93
- *	$Id: shell.h,v 1.2 1994/09/24 02:58:15 davidg Exp $
+ *	$Id: shell.h,v 1.2.6.1 1995/08/30 05:53:08 davidg Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 43fb34c82709..785ed31c5ce1 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: show.c,v 1.2 1994/09/24 02:58:16 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index a09a0cf9782f..dec7bd4da32c 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: trap.c,v 1.2 1994/09/24 02:58:18 davidg Exp $
+ *	$Id: trap.c,v 1.3 1995/05/30 00:07:23 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index a588432ef882..c21496d830e0 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: trap.h,v 1.2 1994/09/24 02:58:20 davidg Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 00420d56b78d..9db81e402da8 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: var.c,v 1.2 1994/09/24 02:58:22 davidg Exp $
+ *	$Id: var.c,v 1.3 1995/05/30 00:07:24 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 38e61ef276c9..758e23836067 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: var.h,v 1.2 1994/09/24 02:58:23 davidg Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 163470fb3bd0..c148da8ccacf 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:58:47 davidg Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index 1e4934bc066c..9dad07d04fe0 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: sleep.1,v 1.2 1994/09/24 02:58:49 davidg Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 773abe830570..14662b9208f2 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: sleep.c,v 1.2 1994/09/24 02:58:51 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index d0b160d74b03..fdff14bcc63d 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:58:53 davidg Exp $
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 8b0c97004024..fec0d204569c 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cchar.c,v 1.3 1995/04/28 19:29:28 ache Exp $
+ *	$Id: cchar.c,v 1.4 1995/05/30 00:07:25 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index aa7a35b13d27..be23aed5dbb7 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:58:56 davidg Exp $
  */
 
 int	c_cchars __P((const void *, const void *));
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index f6ef0e15c443..52e2bebec88f 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gfmt.c,v 1.3 1995/03/19 13:29:23 joerg Exp $
+ *	$Id: gfmt.c,v 1.4 1995/05/30 00:07:26 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 362b6f110be4..5574ba3d05e9 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: key.c,v 1.3 1995/03/19 13:29:25 joerg Exp $
+ *	$Id: key.c,v 1.4 1995/04/28 19:29:29 ache Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 0aa7438ae7f2..a1f4b9d988a6 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: modes.c,v 1.2 1994/09/24 02:58:59 davidg Exp $
+ *	$Id: modes.c,v 1.3 1995/04/29 15:17:17 bde Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 6df7fea2dc16..eb44c19496fe 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.4 1995/04/29 15:17:16 bde Exp $
+ *	$Id: print.c,v 1.5 1995/05/30 00:07:27 rgrimes Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 1f15e17454f4..d323957e65b8 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: stty.1,v 1.2.6.2 1996/06/05 02:36:26 jkh Exp $
+.\"	$Id: stty.1,v 1.2.6.3 1996/07/02 12:45:08 bde Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 5062c0403cdd..40e0f242f111 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: stty.c,v 1.4 1995/05/30 00:07:28 rgrimes Exp $
+ *	$Id: stty.c,v 1.4.4.1 1995/08/25 03:23:33 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 2b822d6a8fb8..115b59c712b0 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: stty.h,v 1.2 1994/09/24 02:59:03 davidg Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 036c48eb1f16..3f62cb22e409 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.2 1994/09/24 02:59:05 davidg Exp $
+ *	$Id: util.c,v 1.2.6.1 1995/08/30 05:56:31 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 0656381fd00c..a4d88ebb052b 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.3 1994/09/24 02:59:07 davidg Exp $
 
 PROG=	sync
 MAN8=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 33c20574a302..0d0ec2f6db42 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\"	$Id: sync.8,v 1.2 1994/09/24 02:59:08 davidg Exp $
+.\"	$Id: sync.8,v 1.2.6.2 1996/06/05 02:36:27 jkh Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 7e5a387e1a21..ff82a60c402f 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: sync.c,v 1.4 1994/09/24 02:59:09 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/test/Makefile b/bin/test/Makefile
index a3a8126b435b..6e2703803311 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:59:10 davidg Exp $
 
 PROG=	test
 SRCS=   test.c operators.c
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index b18fefbaf940..eda32b3a34df 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-#	$Id$
+#	$Id: TEST.csh,v 1.3 1994/09/24 02:59:11 davidg Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/operators.c b/bin/test/operators.c
index 38d73dab38c3..fb2ebd2b88a6 100644
--- a/bin/test/operators.c
+++ b/bin/test/operators.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: operators.c,v 1.3 1994/09/24 02:59:12 davidg Exp $
  */
 
 #ifndef lint
diff --git a/bin/test/operators.h b/bin/test/operators.h
index 4bf8563652fe..19fdc68ac6d4 100644
--- a/bin/test/operators.h
+++ b/bin/test/operators.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)operators.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: operators.h,v 1.3 1994/09/24 02:59:13 davidg Exp $
  */
 
 #define	NOT		0
diff --git a/bin/test/test.1 b/bin/test/test.1
index e7af6447f818..9a010d1a3334 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: test.1,v 1.2 1994/09/24 02:59:14 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index 9131c3b413d0..bed1b79c5c34 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: test.c,v 1.11.4.1 1996/02/20 09:48:53 jkh Exp $
+ *	$Id: test.c,v 1.11.4.2 1996/03/11 11:04:23 joerg Exp $
  */
 
 #ifndef lint
author	cvs2svn <cvs2svn@FreeBSD.org>	1997-02-05 04:29:56 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	1997-02-05 04:29:56 +0000
commit	860c2cf2bc6592828a3468ab8ee661042b059ae8 (patch)
tree	fde30676422ab07fdec2d11fde3fc5693fdbb8cf /bin
parent	b61013aa0c73c687493c80193bc040d29b351fb8 (diff)