release/5.2.1_cvs

author: cvs2svn <cvs2svn@FreeBSD.org> 2004-02-23 15:32:56 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 2004-02-23 15:32:56 +0000
commit: 84a7b99b4e02a260bf7ff9b540032f4cb7bc612a (patch)
tree: 85059f7e88bcf124efae7c17bd99cfa18627a8c4 /bin
parent: a28c3ad292f6f6cbe1c4ff05efb3d53eb45f17ff (diff)
264 files changed, 264 insertions, 264 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 6a5d8c50b63a6..bb972ba6be8b2 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile,v 1.23 2003/02/18 19:51:58 obrien Exp $
 
 SUBDIR= cat \
 	chflags \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index ef37f0391fcff..1a0e35e9f4e87 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile.inc,v 1.20 2003/11/19 16:59:00 marcel Exp $
 
 BINDIR?=	/bin
 WARNS?=		6
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeeeff50..aea110c9ddb3a 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cat/Makefile,v 1.7 2001/12/04 01:57:37 obrien Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index f09096d14caa1..03ebb0ba47b67 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.19 2001/09/25 18:10:18 ru Exp $
 .\"
 .Dd September 15, 2001
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 396c383bd7bef..e3f65a8285931 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 4457505380f33..1be7761e31b40 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chflags/Makefile,v 1.17 2003/02/19 16:56:30 obrien Exp $
 
 PROG=	chflags
 
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 5390c7b899fbb..fc6e5be9fdde0 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.17 2003/05/16 21:18:01 ru Exp $
 .\"
 .Dd March 24, 2003
 .Dt CHFLAGS 1
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 0f42f1a63e5e8..d452a15152e33 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.18 2003/05/01 14:45:27 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 172032832c7a1..b3e534d0e5ea1 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.11 2001/12/04 01:57:38 obrien Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index cb2e47a4ece24..47cb0051b5358 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chio/chio.1,v 1.23 2003/03/24 16:08:13 charnier Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 02cb32f3c9b31..54361437a126a 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 17d2abf33a288..b9c98899f1920 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.4 2002/02/02 06:15:21 imp Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 9a9b74a548156..990709906c8cc 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.2 1999/08/27 23:13:35 peter Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a5232..b6c1065b2e443 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chmod/Makefile,v 1.10 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 0695e52bc73f4..a992b87645e82 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.35 2002/11/25 14:18:42 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 0f97f6973bb2c..8b78c22d7f70a 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.30 2003/10/31 13:20:09 tobez Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 9180efe26c3fe..21fe9d1024d2c 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cp/Makefile,v 1.11 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 9b1f97ca52128..6356d2cccfe55 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.27 2003/06/07 06:35:36 ru Exp $
 .\"
 .Dd July 23, 2002
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index c8b42e37662ec..87aaef54d09c2 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index d578a1b39d08b..dea29787aeb82 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/cp/extern.h,v 1.18 2003/04/07 12:09:17 mdodd Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 782dc6becb079..53aa4a4d6290c 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.42 2003/11/13 05:26:55 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 8b3c2e4b7a8e8..1cbcf371c2ecf 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.34 2003/07/11 05:24:31 kan Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 04b658119ce11..8d32f1cfb2cf3 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.11 2002/12/30 21:18:01 schweikh 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 d9e800159f35b..e83ba867631b9 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.8 2001/07/15 07:49:00 dd Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 4f6e1b7f8ad78..8b75db1694978 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.7 2001/07/15 07:49:00 dd Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 8a2bcbda5ecd3..330c3ef62c44f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.5 1999/08/27 23:13:55 peter Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index 8345e5b4d5f97..d20984c807fda 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.6 2000/11/27 08:50:56 ru Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index 9cce9243e068c..a839473cb7725 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.7 2002/12/30 21:18:01 schweikh Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 7066e0716d36e..6e73af5c1b153 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.5 1999/08/27 23:13:56 peter Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 9e91642bb5ebf..37d48fb2905ab 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -7,7 +7,7 @@
  * Edit this to match your system type.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config.h,v 1.7 2001/09/05 22:56:58 mp Exp $ */
 
 #ifndef _h_config
 #define _h_config
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 1a81ec5657d2e..f5b4bce2509eb 100644
--- a/bin/csh/host.defs
+++ b/bin/csh/host.defs
@@ -1,6 +1,6 @@
 newcode	:
 /* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/host.defs,v 1.2 2001/09/05 21:11:56 mp Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 8a1dc85793307..d5ba10f545855 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index 75707f188bf2f..a7b556016ac1e 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.60 2003/02/23 01:47:47 ru Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index c71f9d3c36684..43fbba714e280 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.44 2003/10/04 07:16:40 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 17b35bbf06a17..c6f05b3be0e48 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/extern.h,v 1.6 2002/02/02 06:24:12 imp Exp $
  */
 
 int	netsettime(time_t);
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 92bb41f0c626d..488dfa348bdd1 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.17 2003/02/05 12:56:40 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index a314e4823ee16..b9258c92876d7 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/vary.c,v 1.15 2002/06/30 05:13:52 obrien Exp $");
 
 #include <err.h>
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index b39306a2bb233..27eddf7e74fe0 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/vary.h,v 1.4 1999/08/27 23:14:00 peter Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 0cbd23895879f..807bdc02a5fcf 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/dd/Makefile,v 1.12 2003/06/13 07:04:01 markm 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 b629b3ad4e44f..fdc6891abd2b7 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index a31e520996904..8fbc6806d9c09 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.18 2003/02/27 18:04:54 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 7d163f833150f..422c5733a6b43 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv_tab.c,v 1.11 2002/06/30 05:13:52 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 588b62f95b9ba..440ef44a170f2 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.21 2002/11/26 17:55:40 ru Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 9deac8a21a68d..2dd925f33e91d 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index c6211d9fb7668..7243c37c47797 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/dd.h,v 1.18 2003/02/27 18:04:54 markm Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index e8354621b6a6e..987d3f80f99dd 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/extern.h,v 1.13 2003/02/27 18:04:54 markm Exp $
  */
 
 void block(void);
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index e14200901d2aa..e13008350da68 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.26 2003/02/27 18:04:54 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 6476f41599567..55b7fbc560704 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/position.c,v 1.22 2003/02/27 18:04:54 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/mtio.h>
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 80c031c428cf4..52274954e74af 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/bin/df/Makefile,v 1.16 2003/06/13 07:04:01 markm Exp $
 
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH:	${MOUNT}
diff --git a/bin/df/df.1 b/bin/df/df.1
index 334d85b64eae0..98ab473d6306c 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index bbaa2973c938d..8f7ccf9058eee 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.53 2003/11/12 21:47:42 kris Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39f..575dac3e0f405 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.7 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index e67fcb39c3d85..d3ea5b1d2b843 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.15 2002/04/16 20:01:22 charnier Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 5da1cd24d37ab..0fb1a780f1472 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -43,7 +43,7 @@ static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac8..bcb27de4d0274 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/echo/Makefile,v 1.8 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index e498af704c217..c92807dd0fa96 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index cb0c7899e975f..f538935f2bb68 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.16 2003/10/11 20:34:43 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index eb82c3908e314..9551d2764b138 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index f81bb0ce1a14b..0a363d650692a 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.8 2000/07/17 10:40:48 sheldonh 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 478e7af07c701..1f50f106fdb55 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.7 1999/08/27 23:14:12 peter 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 db1f0e981bfbe..93c1b92441a83 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/buf.c,v 1.22 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 119403f8d9da9..2de484bc096f2 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 9e68a6e3e66c1..54491a955037c 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $
 .Dd May 21, 1993
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index c40f57374b69d..ea66edf6b23c8 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 11dcc19fcc859..01594c5b21340 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/glbl.c,v 1.13 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 85ba0de0812e9..7a0e7a20adcff 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/io.c,v 1.14 2003/01/01 18:48:39 schweikh Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index bea272494ad0d..566b93f557f85 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -35,7 +35,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.26 2003/05/01 16:58:55 obrien Exp $");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index f89ecf94cd6b5..43f67ae50a020 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 1c44328cc79c6..f774776ca6356 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/sub.c,v 1.15 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131d..c6265ea518a56 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/Makefile,v 1.9 1999/08/27 23:14:17 peter Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d9..e360c4fe86ddc 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/README,v 1.7 1999/08/27 23:14:17 peter Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index deab47555f7ad..2c57449fc3a77 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/ckscripts.sh,v 1.6 1999/08/27 23:14:18 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 1b8b3ee531827..2d1a06f14a7aa 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/mkscripts.sh,v 1.6 1999/08/27 23:14:20 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 6a8ca9e90137b..28374956b7233 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/undo.c,v 1.12 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a257..7daa1c20d3836 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index fd54a2a689998..6b0d8239cd1b5 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.23 2002/11/26 17:55:40 ru Exp $
 .\"
 .Dd May 10, 2002
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 74a33033d2222..f829243b56f94 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.23 2002/10/28 00:15:42 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
index b7b5e983a530e..f5d942796f50c 100644
--- a/bin/getfacl/Makefile
+++ b/bin/getfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/getfacl/Makefile,v 1.6 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	getfacl
 
diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1
index a5320e2f8bf26..e5ee64cc0f2f9 100644
--- a/bin/getfacl/getfacl.1
+++ b/bin/getfacl/getfacl.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"       $FreeBSD$
+.\"       $FreeBSD: src/bin/getfacl/getfacl.1,v 1.7 2003/02/23 01:43:45 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 75ad1dad4e43f..7e9087a47cf74 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc5..95036b30e09cf 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/hostname/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index cb45cbe02814b..b57f3247e67bc 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.14 2002/04/16 20:02:56 charnier Exp $
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 583812dafaa06..897b7c572aa48 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.15 2003/05/01 16:58:55 obrien Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 33a6dfc3bff5c..b63400916250e 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 
 PROG=	kenv
 
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index 4d314f3627e99..15b812f4bc10a 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.10 2003/01/20 17:56:25 obrien Exp $
 .\"
 .Dd July 8, 2000
 .Dt KENV 1
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index edd022cc3f53a..f2816f2614d2c 100644
--- a/bin/kenv/kenv.c
+++ b/bin/kenv/kenv.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.5 2003/01/20 17:56:25 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c9..47b2d5b934424 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/kill/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index c0c8613e304cc..bc6985d2a3d44 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.16 2002/06/13 08:46:01 tjr Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 120dc8797a9ca..09a69f9ac270a 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.16 2003/05/01 16:58:55 obrien Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b541f8bd3be09..072ec41ac051d 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ln/Makefile,v 1.11 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	ln
 MAN=	ln.1 symlink.7
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 0854e911954a1..1dac859fb614b 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.25 2002/08/21 17:32:32 trhodes Exp $
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index f27f25185af60..86f07b6cc0bd3 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.30 2003/05/01 16:58:55 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 2a0a082d2d1f4..dc9f7022952d3 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.25 2002/08/21 17:32:32 trhodes Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 12a130daee0dc..6b973adcb7dac 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 38690feb9a20f..8d5a33eed1edf 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.12 2002/06/30 05:13:54 obrien Exp $");
 
 
 #include <sys/types.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 788138d5a21e0..e06cb550cac9c 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index e2a826a1dad56..9e633547e3f14 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $
 .\"
 .Dd May 19, 2002
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 28eb59ab873c1..984f2743d7d86 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.75 2003/12/01 19:10:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 16c9ac9be3240..98a41e5e68c4f 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.19 2002/10/24 00:07:30 rwatson Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index fb8d71868ce31..ce2e4191be804 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.66 2003/10/16 07:07:20 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 0711b0b5961fc..f331854df8e39 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.32 2003/09/09 12:02:52 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef72..854888ea3962b 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/mkdir/Makefile,v 1.7 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 5590c2331de52..2903a002d9c31 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.17 2002/06/30 06:50:16 tjr Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index c40f5ae017297..4bbe6701d441a 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.27 2003/05/01 16:58:55 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 840578276d5a3..1530f6169c761 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/bin/mv/Makefile,v 1.8 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 12e834b0f4dab..6439600531209 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.25 2002/08/26 06:16:51 keramida Exp $
 .\"
 .Dd July 9, 2002
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 009ce513f2cac..84352176472bc 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index f142bfcc05a20..e3e31cf66a555 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pax/Makefile,v 1.11 2003/06/13 07:04:02 markm 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 01c441c048171..c22c52bf0d73f 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.23 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index c345fc0cb7bae..20e2223f32366 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.22 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 154ec03addb28..68dc8122e5d0f 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/buf_subs.c,v 1.22 2003/01/01 18:48:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 9ae4d8994df75..99386d5153795 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.19 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 642058851070b..a26be7371c860 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cache.h,v 1.8 2002/08/21 17:32:37 trhodes Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index 5a383257d3100..80cecaa1181c8 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -27,7 +27,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.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/bin/pax/cpio.1,v 1.3 2002/04/20 11:56:11 charnier Exp $
 .\"	$OpenBSD: cpio.1,v 1.16 2001/05/01 17:58:01 aaron Exp $
 .\"
 .Dd February 16, 1997
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index efce4bf166f7f..47c7e8db79adf 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.22 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 2b72f53b6c1ec..e6f4a0ba32dd3 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cpio.h,v 1.6 1999/08/27 23:14:41 peter Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index ba5782176cc80..28eb8aacf0a60 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/extern.h,v 1.14 2003/05/03 16:39:33 markm Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 13770c3e09f5e..0b73ab8aa1981 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.20 2002/08/21 17:32:37 trhodes Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 6d5ec68482fbf..0d5a06253022b 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.22 2003/01/01 18:48:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 6ff282b82375f..471a4847a56fe 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/ftree.h,v 1.6 2001/05/08 06:19:06 kris Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index bb5643480d5e4..8cdf5dbfe4c5f 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.22 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 94611a6aedca4..8e55cd85b7850 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.4 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 1475e89c9527e..3041ac37903d1 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.29 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index b1de2b6de7cfe..0711b6bde5b9b 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/options.h,v 1.5 1999/08/27 23:14:43 peter Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 08e5b9a577804..d1905d54178dd 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.24 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index e0d812b1de95a..5475527f26d9f 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pat_rep.h,v 1.5 1999/08/27 23:14:44 peter Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 26ffc54eae80b..c4507688de43e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.29 2003/01/10 17:37:23 obrien Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 9f8c4366019c2..1c151885fb27a 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.27 2003/05/03 16:39:33 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index d61bc0473c6e4..1bd4e8f737813 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pax.h,v 1.17 2003/05/03 16:39:33 markm Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 181c083dc8916..3ef3330ee5741 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.18 2003/01/01 18:48:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index ab24ab00d1991..9c31ba03823b9 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/sel_subs.h,v 1.5 1999/08/27 23:14:46 peter Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index f60723b90992a..9d95d7481d1f2 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.21 2003/01/01 18:48:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index 74c91f79d0ad2..1fe978b66c496 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tables.h,v 1.9 2002/08/21 17:32:37 trhodes Exp $
  */
 
 /*
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index ff940e5ba8a89..d01148ffb49ca 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -27,7 +27,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.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/bin/pax/tar.1,v 1.7 2003/05/01 02:37:46 tjr Exp $
 .\"	$OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $
 .\"
 .Dd February 7, 2001
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 5c3eb5a8f1c42..a342ca0572f71 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.22 2003/05/02 00:03:10 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 83df0da2784e1..3bdb2f60e4002 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tar.h,v 1.6 1999/08/27 23:14:47 peter Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index d1a5470018957..d322bb2b257ce 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tty_subs.c,v 1.19 2002/10/06 09:23:58 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index ca6d51af25819..ed9300a384dc2 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.24 2003/06/13 07:04:02 markm Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 2ce5e45676323..edc217d46c35a 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/extern.h,v 1.31 2003/08/13 07:35:07 harti Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 1d907af686f9d..fc31e6e1368f2 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.29 2003/05/03 20:52:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 918feca05ec07..81d0941a031c9 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.64 2003/08/13 07:35:07 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index e6bc85fea8d3c..4a74f1a57f90b 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.20 2003/02/05 13:18:17 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 7e0f816b97169..963df728f3dd2 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.83 2003/08/13 07:35:07 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 7a96f7becdf2e..3a7e31754c1db 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.65 2003/09/08 19:57:13 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index b288d71e02e47..67e159bd3f3a2 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.63 2003/06/12 16:53:55 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/user.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 6d84697eb75e6..86cc151aea185 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/ps.h,v 1.16 2003/04/12 10:39:56 tjr Exp $
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4a8e66ac8320d..aa2f8e79cc9b2 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pwd/Makefile,v 1.11 2002/02/11 18:38:54 mike Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 63c380feba691..4945324fb64f1 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.22 2003/05/16 21:19:32 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 888b26e0c0444..15b31c9913826 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.22 2003/06/30 17:05:40 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index a9a4da5886bba..2e0df09303c29 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index ebd2bebe1034f..e62f7ad301a56 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/extern.h,v 1.8 2002/06/20 06:00:51 jmallett Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 217e1b8f43482..8a44f737ee3cf 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.15 2002/08/09 16:12:08 ume Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index f70a35134d6bc..e548f14604c9e 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.43 2003/10/14 20:42:13 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 15b1b9ea2c35e..4dda4b802bc91 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.16 2002/10/16 16:06:46 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
index acf62c76cb3a5..ce3d8ae718f5f 100644
--- a/bin/realpath/Makefile
+++ b/bin/realpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/realpath/Makefile,v 1.1 2002/02/11 07:32:17 mike Exp $
 
 PROG=	realpath
 
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index 61358ac007bf8..953ae507d4d88 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.7 2002/04/20 11:56:19 charnier Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index 224e775e7df6c..7bababc94ce72 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.5 2003/01/15 21:22:55 johan Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 7b85cdf90fc03..5797804da94a7 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rm/Makefile,v 1.17 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	rm
 SRCS=	rm.c
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index d1ca663ff66ca..7957f8b82f54a 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.27 2003/02/04 20:38:51 trhodes Exp $
 .\"
 .Dd January 28, 1999
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 7458dd0a0bb2d..0c3f3b474cae2 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.45 2003/11/10 09:40:18 guido Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index f721d8dd7d60c..2d610e089b920 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmail/Makefile,v 1.18 2003/07/07 03:54:02 gshapiro Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce492..e596b0a84c08f 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmdir/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 018b793ae8532..577637a51d973 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.9 2000/11/20 11:39:40 ru Exp $
 .\"
 .Dd May 31, 1993
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 606cf7e34f24a..eea2bfb20ab62 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
index ff67650ef8fa6..e34d542caddfd 100644
--- a/bin/setfacl/Makefile
+++ b/bin/setfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.7 2001/12/04 01:57:46 obrien Exp $
 
 PROG=		setfacl
 SRCS=		file.c mask.c merge.c remove.c setfacl.c util.c
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index c9d21d61d5eec..b6c96d8229dc7 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/file.c,v 1.4 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index e4d18f73bdfd0..81740264e7238 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.7 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index b9d45f8c188da..97b184ac75b0b 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.7 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index dc0c3a8f784ae..fa36cbc3b0969 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.5 2002/06/30 05:15:03 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 452a0411b287a..0bf920b640628 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.9 2003/08/07 14:52:17 rwatson Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index 7350654612300..964f436de6536 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.9 2003/08/07 14:43:43 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h
index 91b4f00330415..c9fd96fdad45c 100644
--- a/bin/setfacl/setfacl.h
+++ b/bin/setfacl/setfacl.h
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $
  */
 
 #ifndef _SETFACL_H
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index 4976301bd5c44..0e6e39561dcc8 100644
--- a/bin/setfacl/util.c
+++ b/bin/setfacl/util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.5 2002/06/30 05:15:03 obrien Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 27a77e73eb486..55771a515c81b 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/Makefile,v 1.40.4.1 2003/12/07 04:03:59 scottl Exp $
 
 PROG=	sh
 SHSRCS=	alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 5a0b76b7ea909..66605d2902931 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 peter 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 45cfd74a2d535..d18c750ef19dd 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.17 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a5879ef94ed50..1506ccd1bc75a 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.7 2002/02/02 06:50:45 imp Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index ab9a848589bec..9df69b079a667 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.8 2003/09/04 18:28:42 schweikh Exp $
  */
 
 int arith(char *);
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index a445a43284398..0ae73b4202d4e 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.17 2003/09/07 10:14:56 schweikh Exp $");
 
 #include <limits.h>
 #include "shell.h"
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 98146cb04a879..91771be79b2bf 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.21 2003/09/06 16:33:55 tjr Exp $");
 
 #include <string.h>
 
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 9d6e68deb04e6..6835ba872d7af 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.12 2002/02/02 06:50:55 imp Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 15393b1f1c4cc..ec8c0c63d6341 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.11 2002/12/05 08:49:59 ru Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index fcd62662479a9..ee6558cc80379 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.13 2003/02/05 13:23:46 charnier Exp $");
 
 /*
  * Echo command.
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index a5d4542a7db96..9350a59640ae1 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.13 2002/12/26 14:28:54 tjr 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 3a45d95e6ea76..7780cc2f0abb6 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.33 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 043d405e3de77..b8cb12658a859 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/cd.h,v 1.6 2002/02/02 06:50:46 imp Exp $
  */
 
 char	*getpwd(void);
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 7b00c8b7cc818..fa80bd14ac8ba 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.24 2002/09/29 11:37:39 tjr Exp $");
 
 /*
  * Errors and exceptions.
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 87442e035bc56..ae45e7f42401f 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.16 2002/09/29 11:37:39 tjr Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 412f65092e13d..ebce46b3300b0 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index ff30c0c1695a4..bdfc4e067c428 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.9 2002/07/21 06:49:14 tjr Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 5a19977423644..c57d2d7885ed4 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.23 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index dd1fd81ce2172..20cc2eb84db63 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.11 2003/07/05 15:18:44 dds Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 261bc7e3108b3..280b926683ed2 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.45 2003/08/03 04:28:10 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 9343bf3949a04..5e62f05417b3d 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.11 2002/12/26 14:28:54 tjr Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 6e9dcff9c088a..b43e6919c89c5 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.6 1999/08/27 23:15:33 peter Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index a5d3c8e7eeffc..83916f553faaf 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.6 1999/08/27 23:15:34 peter 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 7455571f8b982..d5ea3536884fb 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.6 1999/08/27 23:15:34 peter 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 7a6fc855bfc2e..d8f5ae29dad53 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.6 1999/08/27 23:15:34 peter 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 fd8e5d6ee5a73..cbb0b3acdcabf 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.6 1999/08/27 23:15:34 peter Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index e0be35a13a79c..fb0d4fab159e6 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.6 1999/08/27 23:15:35 peter 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 d60ede2cbbccb..94325e9fae8c2 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.6 1999/08/27 23:15:35 peter 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 f06e12ff0575b..69817cceec459 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.6 1999/08/27 23:15:35 peter Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 1e64171ea3725..30cf993bbcc13 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.25 2002/10/30 06:34:52 tjr Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 57359dd1a7989..2ebeeaa2f2fdf 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 void init(void);
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 85b94d6759ec9..179b90c4bf44a 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.20 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/sh/input.h b/bin/sh/input.h
index bab05c4958436..ee5036b3f23fb 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.8 2002/02/02 06:50:46 imp 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 7c9cfa4005f96..fe91a3975bbd9 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.64 2003/07/05 15:18:44 dds Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 53c0ba05ae0ea..8998bfb0c2e65 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.17 2002/07/18 10:22:42 tjr Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 482b501b63765..542db73f3f98e 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.12 2002/06/30 05:15:03 obrien Exp $");
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index a77029c172894..c6bc33e9538f7 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.c b/bin/sh/main.c
index f47ab0a283e8a..062171e083372 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.25 2002/10/01 01:30:33 tjr Exp $");
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index b1d06efd8fb42..4e04d3ae60149 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 6334290bd10de..017004a81fb8d 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index c43d8fd1ccfe0..57bdc73131999 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.8 2002/02/02 06:50:46 imp Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index bdd22e0195a3c..9aea117248264 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.29 2002/10/01 11:44:38 mux Exp $");
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index d91cd91d49e93..c132cadd3008e 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.12 2003/09/13 06:59:22 schweikh Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 5902fe6ce4e01..1839f1b1dd782 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.16 2002/06/30 05:15:03 obrien Exp $");
 
 /*
  * This program scans all the source files for code to handle various
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index d87179b3c4f53..8d4634c553012 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.16 2003/05/01 16:58:56 obrien Exp $");
 
 /*
  * This program reads the nodetypes file and nodes.c.pat file.  It generates
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index d75b68af8d50e..ebabf22facbaa 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.22 2003/05/01 16:58:56 obrien Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index e08997f7e9cf9..88e04895b9097 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.8 2002/06/20 05:20:50 jmallett 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 644b2c0253025..2453855e989f3 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.9 2002/07/23 11:50:53 tjr Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index bc3d1cac84da4..4c0cab17c7f0b 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mystring.c,v 1.12 2002/06/30 05:15:04 obrien Exp $");
 
 /*
  * String functions.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index d29f83246f2e2..81ee1de3a92cf 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.7 2002/02/02 06:50:47 imp Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 631961337e0a6..994b405bb9e08 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.14 2003/07/05 15:18:44 dds Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index 27fbcd171a04b..ae3b5b394ef58 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.8 2002/05/19 06:03:05 tjr 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 54fdd72c65142..473090086b76f 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.20 2002/06/30 05:15:04 obrien Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 5aec64e245d92..c66a412c43bf4 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.12 2002/07/25 10:57:39 tjr Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index f332106ac4a9b..192986b792bdb 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.18 2003/07/05 15:18:44 dds Exp $");
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/sh/output.h b/bin/sh/output.h
index cc08526c317e6..8e5dd6aca4fe0 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.12 2002/06/04 13:13:54 tjr Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index da166e6503ba7..a1fdc77b4ae18 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.49 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdlib.h>
 
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index c83d66a9decf5..e6e439714a7c0 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.9 2002/02/02 06:50:47 imp Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 547cdcc4ac6bc..42a3f945a7a97 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.24 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index e786004d7cf3c..5cdb677a7896d 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.8 2002/02/02 06:50:47 imp Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 802856a6787c2..0ae58ce1beb14 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.88 2003/09/08 19:57:13 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index f6d8cb75724f1..d03bbbdad88cc 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.16 2003/09/04 18:28:42 schweikh Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 7f19a51d6e74e..911c2305c16d8 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.20 2003/01/21 10:06:04 tjr Exp $");
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index edd43096a06c0..e5df7b829af77 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.10 2002/02/02 06:50:47 imp Exp $
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index f848ee122b261..d56fcb20e71c4 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.25 2002/07/24 02:06:07 tjr Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 557840160f1f5..06334ee403d36 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.11 2002/07/24 02:06:07 tjr Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 7ef73f16eb05d..2803614fbc0c3 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index f2365aafd06d4..a5573a9554fb1 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.11 2002/10/01 00:54:14 tjr Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 4ff73308c45b6..c05223b94e123 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sleep/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index c08b2fc029f89..923a208f87415 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.19 2002/06/10 09:33:15 tjr Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 739e4d4266b35..ea4410f5f636b 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.17 2003/05/03 10:14:26 markm Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae5..263322db07fdb 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/stty/Makefile,v 1.8 2001/12/04 01:57:46 obrien 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 bb909ad45b54a..0f77d39685f77 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/cchar.c,v 1.13 2002/06/30 05:15:04 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 35d5f9afe554e..193142a6a1bb4 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/extern.h,v 1.9 2002/02/02 06:50:56 imp Exp $
  */
 
 int	c_cchars(const void *, const void *);
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 2406ecfda774e..bbb416f27d94f 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/gfmt.c,v 1.19 2003/05/03 10:16:51 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 78bc2edc28686..8f25b9e14cd06 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.17 2002/06/30 05:15:04 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index d5400e7ba8b9f..ec1d5a78e197e 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/modes.c,v 1.12 2002/06/30 05:15:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 064d4e70688af..d63eda1435327 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.18 2002/06/30 05:15:04 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 649032f0f913b..0f1f7b8215e24 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.27 2001/11/29 15:46:54 green Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 70e36810856b9..1e119845c4dd6 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.21 2003/05/01 16:58:57 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index d20f0c6a312f8..91c710f9fc255 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/stty.h,v 1.8 2001/05/18 11:04:19 kris Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index a2678d8be0879..9cab1c73a17dd 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/util.c,v 1.10 2002/06/30 05:15:04 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 72c664f4afdd0..1e24647e9b8b4 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sync/Makefile,v 1.10 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sync
 MAN=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 6972924d31573..3e7205f214e83 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.14 2002/07/06 19:13:21 charnier Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 6581ba665dbfc..af708cbe8dbcc 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sync/sync.c,v 1.14 2003/05/01 16:58:57 obrien Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 7c64b40347eff..11301f60d03cf 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index f291953749680..d4c5a65b4cfaa 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.README,v 1.4 1999/08/27 23:15:47 peter Exp $
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index afa1c91f158a2..f3e0237926d10 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.csh,v 1.6 1999/08/27 23:15:47 peter Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index d3aa83cccecdd..ac035d1ada90a 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -26,7 +26,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.7 2000/05/07 08:56:21 kris Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index 7b8a84f7d331f..cd9f74d3ccebf 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.17 2001/11/17 19:10:11 knu Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index e81bdd56e4dcd..9e9077eae7a9d 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.52 2002/08/19 09:19:31 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
author	cvs2svn <cvs2svn@FreeBSD.org>	2004-02-23 15:32:56 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2004-02-23 15:32:56 +0000
commit	84a7b99b4e02a260bf7ff9b540032f4cb7bc612a (patch)
tree	85059f7e88bcf124efae7c17bd99cfa18627a8c4 /bin
parent	a28c3ad292f6f6cbe1c4ff05efb3d53eb45f17ff (diff)