release/8.1.0_cvs

288 files changed, 288 insertions, 288 deletions

diff --git a/bin/Makefile b/bin/Makefile
index 3114e670097f..46d452b13154 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.28.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index ec24a486b9de..f6c581b09553 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.23.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 689dd4d28d08..2c40c4f34f07 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.8.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	cat
 WARNS?=	6
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 1f0f6b60a31c..7232d677d552 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.27.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd March 21, 2004
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index d338742229f0..018f31afa572 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -44,7 +44,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.33.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 4457505380f3..e98b36281387 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.19.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	chflags
 
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 904c366846dc..f63347362293 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 2c07db9becc4..614c120df426 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -40,7 +40,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.26.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 5157f6568a6c..d8b40e02612d 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.12.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 920c31e81648..2d8f6f9ff7b5 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.27.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index aaddb689d52f..f6b7fd654ce0 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.28.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 8f10c9d9243a..a2cca93eeb06 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.5.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 5b9b1e429dc2..5e05d73b191e 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.3.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a523..756211b1425b 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 4ba231b3f033..36dccddd533a 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.42.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 26, 2009
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index dc51faa39b01..d28f808edcad 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -39,7 +39,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.35.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 5a5e1a457d16..be40259fc623 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.12.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index fc5a9f73ad65..6734957d7154 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.40.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 17, 2010
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 0ae57eba590e..64bb7c4f2cb6 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -42,7 +42,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.60.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index 94c416b048ec..1c68dcdbeec4 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/cp/extern.h,v 1.21.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index b075eac46d04..f736049bcb67 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -33,7 +33,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.58.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index d95197b128d4..c57322845d5c 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.40.10.1.4.1 2010/06/14 02:09:06 kensmith 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 915cb2307f99..8a26e44e0d26 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.13.22.1.4.1 2010/06/14 02:09:06 kensmith 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 5fbf43c0b72b..35432721f72d 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.11.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 76ee1ebd5d17..5821b925342a 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.9.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 7ef24dcfe537..32b72aef8d58 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.7.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index 22c8f76b28fe..5b16e35a7fc4 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index ba1b161ad512..d5ef4cfca2a9 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.9.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 196d4371ce28..b11ec87303e8 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -27,6 +27,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.7.22.1.4.1 2010/06/14 02:09:06 kensmith 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 0971ffa3faa1..40ebddd7f76d 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config.h,v 1.15.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index 8c29053e3176..36de51d0cf88 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config_p.h,v 1.14.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $ */
 /*
  * config.h -- configure various defines for tcsh
  *
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 5eb251ace0ee..c34f9beeff62 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.3.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
diff --git a/bin/csh/iconv.h b/bin/csh/iconv.h
index 89e9d0db59ac..a31136bb88ba 100644
--- a/bin/csh/iconv.h
+++ b/bin/csh/iconv.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/csh/iconv.h,v 1.1.12.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #ifndef _ICONV_H_
diff --git a/bin/csh/iconv_stub.c b/bin/csh/iconv_stub.c
index d1a9e475d87e..afcd4d2e8360 100644
--- a/bin/csh/iconv_stub.c
+++ b/bin/csh/iconv_stub.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1.12.2.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <dlfcn.h>
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 8a1dc8579330..be22f52270d1 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.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index 1320748a5790..d1c7634c1816 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.75.10.2.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd June 3, 2010
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index 578229eb4308..a673217400ee 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -40,7 +40,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.48.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 76b8d5e16105..98fb5aca4598 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/extern.h,v 1.7.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 int	netsettime(time_t);
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index b8441068eadf..2342a50db70f 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -34,7 +34,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.19.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index 5f0123110ee3..b4f602d82d9c 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.16.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <err.h>
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index b39306a2bb23..e8e0bc4a8603 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.56.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index eb8ec8527b17..013886b4714b 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.19.10.1.4.1 2010/06/14 02:09:06 kensmith 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 161fbfcb0d48..789c152cc15c 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -37,7 +37,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.40.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index cd66258c2945..061ed8f05347 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -37,7 +37,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.19.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 9bfd10921823..3ebfe50d0503 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -37,7 +37,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.12.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 60b0b3e3b3c0..5433ec1a048a 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.33.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 23, 2009
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 0bb43f789b1a..d7fe058d7abd 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -43,7 +43,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.43.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ad283fd516a1..b6ca3df23dc1 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/dd.h,v 1.22.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 9c540ad36546..59bebf41fc1b 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/extern.h,v 1.15.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 void block(void);
diff --git a/bin/dd/gen.c b/bin/dd/gen.c
index 9c7571a9ab91..6f53f9479438 100644
--- a/bin/dd/gen.c
+++ b/bin/dd/gen.c
@@ -1,7 +1,7 @@
 /*-
  * This program is in the public domain
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/gen.c,v 1.2.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 4f538bc4bfbd..aec57b3ba168 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -37,7 +37,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.27.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index a638597707dd..b0b8b742376f 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -37,7 +37,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.23.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/mtio.h>
diff --git a/bin/dd/ref.ascii b/bin/dd/ref.ascii
index 7ff13e5a80ed..5cc26257dbc5 100644
--- a/bin/dd/ref.ascii
+++ b/bin/dd/ref.ascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ascii,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.ebcdic b/bin/dd/ref.ebcdic
index 605716552cab..71f44a692b1d 100644
--- a/bin/dd/ref.ebcdic
+++ b/bin/dd/ref.ebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ebcdic,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.ibm b/bin/dd/ref.ibm
index 4836baf221aa..c007bd722261 100644
--- a/bin/dd/ref.ibm
+++ b/bin/dd/ref.ibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ibm,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.lcase b/bin/dd/ref.lcase
index 9f9567296468..32013de73f58 100644
--- a/bin/dd/ref.lcase
+++ b/bin/dd/ref.lcase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.lcase,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.oldascii b/bin/dd/ref.oldascii
index bb1ad0a7242b..686d319db454 100644
--- a/bin/dd/ref.oldascii
+++ b/bin/dd/ref.oldascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldascii,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.oldebcdic b/bin/dd/ref.oldebcdic
index 4a7fde7e65b6..1096daa26e62 100644
--- a/bin/dd/ref.oldebcdic
+++ b/bin/dd/ref.oldebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldebcdic,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 4f 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@O.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.oldibm b/bin/dd/ref.oldibm
index 4836baf221aa..8f759e69e5b4 100644
--- a/bin/dd/ref.oldibm
+++ b/bin/dd/ref.oldibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldibm,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.pareven b/bin/dd/ref.pareven
index c64e63e30660..5166d71f31c3 100644
--- a/bin/dd/ref.pareven
+++ b/bin/dd/ref.pareven
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.pareven,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 81 82 03 84 05 06 87  88 09 0a 8b 0c 8d 8e 0f  |................|
 00000010  90 11 12 93 14 95 96 17  18 99 9a 1b 9c 1d 1e 9f  |................|
 00000020  a0 21 22 a3 24 a5 a6 27  28 a9 aa 2b ac 2d 2e af  |.!".$..'(..+.-..|
diff --git a/bin/dd/ref.parnone b/bin/dd/ref.parnone
index fba31c142448..001d190b0ea6 100644
--- a/bin/dd/ref.parnone
+++ b/bin/dd/ref.parnone
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parnone,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.parodd b/bin/dd/ref.parodd
index f0bc449e3648..62aad1bb4359 100644
--- a/bin/dd/ref.parodd
+++ b/bin/dd/ref.parodd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parodd,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  80 01 02 83 04 85 86 07  08 89 8a 0b 8c 0d 0e 8f  |................|
 00000010  10 91 92 13 94 15 16 97  98 19 1a 9b 1c 9d 9e 1f  |................|
 00000020  20 a1 a2 23 a4 25 26 a7  a8 29 2a ab 2c ad ae 2f  | ..#.%&..)*.,../|
diff --git a/bin/dd/ref.parset b/bin/dd/ref.parset
index baa1c57163a2..843a9c671db4 100644
--- a/bin/dd/ref.parset
+++ b/bin/dd/ref.parset
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parset,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  80 81 82 83 84 85 86 87  88 89 8a 8b 8c 8d 8e 8f  |................|
 00000010  90 91 92 93 94 95 96 97  98 99 9a 9b 9c 9d 9e 9f  |................|
 00000020  a0 a1 a2 a3 a4 a5 a6 a7  a8 a9 aa ab ac ad ae af  |................|
diff --git a/bin/dd/ref.swab b/bin/dd/ref.swab
index 79e57b79b738..73c55217ff88 100644
--- a/bin/dd/ref.swab
+++ b/bin/dd/ref.swab
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.swab,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  01 00 03 02 05 04 07 06  09 08 0b 0a 0d 0c 0f 0e  |................|
 00000010  11 10 13 12 15 14 17 16  19 18 1b 1a 1d 1c 1f 1e  |................|
 00000020  21 20 23 22 25 24 27 26  29 28 2b 2a 2d 2c 2f 2e  |! #"%$'&)(+*-,/.|
diff --git a/bin/dd/ref.ucase b/bin/dd/ref.ucase
index 70d8a903c354..aa25a368f5d9 100644
--- a/bin/dd/ref.ucase
+++ b/bin/dd/ref.ucase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ucase,v 1.1.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/df/Makefile b/bin/df/Makefile
index df6574ce2adb..c60e33a48fb4 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.18.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH: ${MOUNT}
diff --git a/bin/df/df.1 b/bin/df/df.1
index 8ed6fc6d15cf..719504c67f29 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.42.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd November 23, 2008
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index be811a149428..bd12c8772107 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -44,7 +44,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.74.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39..495589339dc3 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.7.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 0f9245077242..49635b7a2383 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.19.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index da3e607c0e14..e3a34b1cf3a1 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -39,7 +39,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.19.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac..db57a281b8ec 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 5f7123e9c28a..65d4a7408a42 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.19.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 68ff581f8475..74dd8dea5e3a 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -39,7 +39,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.19.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 32e2dfa721de..48b5c0e99ef0 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.34.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index f81bb0ce1a14..fd0442111eeb 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.8.36.1.4.1 2010/06/14 02:09:06 kensmith 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 478e7af07c70..cf93a55b5565 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.7.56.1.4.1 2010/06/14 02:09:06 kensmith 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 db1f0e981bfb..ffca4b241634 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 52e99998d67c..d3bf07cca47e 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.20.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 20fc8052cee7..c7fc5f09caf3 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.35.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .Dd July 3, 2004
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 2021232c0490..88d504faffef 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.20.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 11dcc19fcc85..1c58b6a8a8f2 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 85ba0de0812e..dd22496180e5 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.34.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 2273c951593a..66d8d4abe2c0 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.29.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index f89ecf94cd6b..37fda6048c24 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.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 1c44328cc79c..5a414f2a0c0e 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131..6fa40df98d5b 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.56.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d..290e40f70970 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.56.1.4.1 2010/06/14 02:09:06 kensmith 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 deab47555f7a..d9d173504388 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.56.1.4.1 2010/06/14 02:09:06 kensmith 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 1b8b3ee53182..d04ea5c8fd4f 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.56.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 6a8ca9e90137..2ba41e760b23 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include "ed.h"
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a25..deef3396ce05 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.18.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 3f8eabbdde66..d7479cb4a9b3 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.29.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd July 12, 2004
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 356bac294d62..77e1f30b6220 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -5,7 +5,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.25.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
index b7b5e983a530..efd2d7e07fd8 100644
--- a/bin/getfacl/Makefile
+++ b/bin/getfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/getfacl/Makefile,v 1.6.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	getfacl
 
diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1
index 58202299f656..b8cf4712eb7b 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.11.10.2.2.1 2010/06/14 02:09:06 kensmith 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 ea376c78f0ef..92088aadc9b0 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.12.10.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc..37d2ada4d022 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index bfff27baa6c6..10a4450d3157 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd December 7, 2006
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 87136eb5f408..4222f48c77fd 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -39,7 +39,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.20.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 33a6dfc3bff5..c2ee232f77ef 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	kenv
 
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index 28d89a5cf1b2..be9caaeef5c0 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -22,7 +22,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.16.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 13, 2009
 .Dt KENV 1
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index dc86ba8200a9..455d421a6c71 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.8.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c..0a39dac8400c 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index c666ef59416d..9a6ea99859bf 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.21.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 8ee1d85d398f..3c61a07cf0db 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -39,7 +39,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.20.22.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b541f8bd3be0..261269a136d3 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	ln
 MAN=	ln.1 symlink.7
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 6f554c8042fc..68a62848b12d 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.35.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd July 17, 2009
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index fc3afc133083..c795b1b4a701 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -39,7 +39,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.39.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 8c09f281a515..652ddc6c9e52 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.30.22.3.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 25, 2010
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 2af1203b1d38..0c48e1ccc6f0 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.26.30.1.4.1 2010/06/14 02:09:06 kensmith 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 badd10867465..78c4fbb4022f 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -36,7 +36,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.18.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 
 #include <sys/types.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index f290fbbe7e05..1ede1f059146 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/extern.h,v 1.25.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 22f4fc0a8f3e..b234625859ae 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.103.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 4, 2008
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index d625f67cf7c3..10c2ab1020bf 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -42,7 +42,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.86.2.4.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index a74abf0c9e5b..03b6c119ffbc 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.23.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 3f2033c404db..ea8b1914001b 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -36,7 +36,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.78.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index ecb1732b851e..4fd35f54046a 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -36,7 +36,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.41.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef7..70652675da0a 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.9.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 0f8d812f1da9..39a0ca8d065a 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.23.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 5fa002fb7007..b068da91e61b 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -39,7 +39,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.33.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 840578276d5a..99210e97a22f 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 9e4d9ee0d4bd..94e78ea3b2ba 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.30.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd May 12, 2007
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 1f98f94657f4..8806b38d50d3 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -42,7 +42,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.51.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 022ad22571b3..90ac4b2f7b7d 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.12.30.2.2.1 2010/06/14 02:09:06 kensmith 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 0946a8884c5f..525bca9f03ff 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -37,7 +37,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.28.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index da275c2dacb0..b3f42d870070 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -37,7 +37,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.24.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 1d01d4e5090a..36d506dd3ebe 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -37,7 +37,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.23.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 358707d362c3..a7d2cee9e208 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -37,7 +37,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.21.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 36d59ca7b12c..f7c0b56014e7 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cache.h,v 1.9.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 67602fa87455..0688622d14f8 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -37,7 +37,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.24.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 2f4c37cb688a..3964cea2375f 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cpio.h,v 1.7.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index e7167928e2f9..28bdf2d50300 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/extern.h,v 1.16.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 0fad68ef64cd..faf718a3d258 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -37,7 +37,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.23.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index f402c568ddfa..288fc20cdb04 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -37,7 +37,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.24.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 4538977754e4..c71eb1aed41b 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/ftree.h,v 1.7.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index ce2041985a1d..0c7670e155d6 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -37,7 +37,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.23.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 1c9f63cfb61d..9ddfe5868208 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.5.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 6f43940d1e47..0837eb8e4dd6 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -38,7 +38,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.31.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index 948e012671e8..7fc2468b9fc9 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/options.h,v 1.6.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 62539a2a3a85..6eb4ce69512b 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -37,7 +37,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.27.10.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index 0eedd679caae..4f4ecafba9e6 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pat_rep.h,v 1.6.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 373ec9baa9de..850d5f2c3d4b 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.37.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd July 3, 2004
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index cb19b99b175e..a5cb49e682af 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -43,7 +43,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.28.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index c80ae7e0e11d..f46679fe5a63 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pax.h,v 1.18.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index bd5c560afc53..b07712b2dada 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -37,7 +37,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.21.10.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index eed4641a17d5..f5b4ed2daac1 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/sel_subs.h,v 1.6.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 4e96fea62313..2e5ef8e31541 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -37,7 +37,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.24.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index ba59f913e7ab..a9609f26b674 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tables.h,v 1.10.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index ab5bd3b12ad5..710b9c762485 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -37,7 +37,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.25.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 856e26c8336a..096296c3cc06 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tar.h,v 1.7.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index b3d140eb41cc..7536db7b6795 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -37,7 +37,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.20.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
index 3437c0db0a17..5e69370f02ed 100644
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
-# $FreeBSD$
+# $FreeBSD: src/bin/pkill/Makefile,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	pkill
 WARNS?=	5
diff --git a/bin/pkill/pkill.1 b/bin/pkill/pkill.1
index 1db38f042fde..fb01a0d7836d 100644
--- a/bin/pkill/pkill.1
+++ b/bin/pkill/pkill.1
@@ -1,6 +1,6 @@
 .\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.4.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index ae0fd89e4ee1..32ca2ea4bd3f 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.4.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 9be197933ee8..dac84299a305 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.27.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index c44127817ffd..32e034c1124f 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/extern.h,v 1.39.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 1e9fed8710f0..afb61391f68b 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -34,7 +34,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.34.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index f0b30092a696..d822fb067ebc 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -33,7 +33,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.79.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f5e600b83959..f19324ffa49f 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -34,7 +34,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.21.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index aa4f98f2c7bc..51b11577263f 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -34,7 +34,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.100.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 62d5336956c0..8a1a1f56ca9c 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.92.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 13, 2010
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 0667db9b5c40..77f0bdd3c9cd 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -47,7 +47,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.117.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index ddaebed53127..1676a951c997 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/ps.h,v 1.20.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <sys/queue.h>
diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile
index cdf322e27a8f..3c3ca8131ff7 100644
--- a/bin/pwait/Makefile
+++ b/bin/pwait/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/pwait/Makefile,v 1.1.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	pwait
 
diff --git a/bin/pwait/pwait.1 b/bin/pwait/pwait.1
index 132d83c98ceb..a71a3b897f84 100644
--- a/bin/pwait/pwait.1
+++ b/bin/pwait/pwait.1
@@ -30,7 +30,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwait/pwait.1,v 1.1.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd November 1, 2009
 .Os
diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c
index 26cf1bd8970d..82b3b200fc66 100644
--- a/bin/pwait/pwait.c
+++ b/bin/pwait/pwait.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pwait/pwait.c,v 1.1.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/event.h>
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4a8e66ac8320..d070a1b9b416 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 2b687a5e3b7f..52beebfcca5e 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.26.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 12, 2003
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 4baf3aa9e3be..11c752b303b8 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -39,7 +39,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.25.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 1c156a236d11..f3378441ad74 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.23.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index db69959234a5..2614cd9153f2 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/extern.h,v 1.9.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index f3c3a8edd334..26de9eb53a2f 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.22.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd October 16, 2002
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 0a9b7ba2ff60..7eb14eeba775 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -46,7 +46,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.47.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 3296fe0cbe96..286e9f93d8fc 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -33,7 +33,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.17.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
index acf62c76cb3a..d8e15a249426 100644
--- a/bin/realpath/Makefile
+++ b/bin/realpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/realpath/Makefile,v 1.1.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	realpath
 
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index cf904edd49b8..a7c429acf394 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -31,7 +31,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.11.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index 99f5a9d50266..22a4a9c271d3 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 7058fa06c98d..46ba4c5fdbe5 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.18.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	rm
 
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 9df8458cbfc9..a8ddf52e4500 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.43.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd December 26, 2006
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index d9bd296f50e1..3ae97d932d60 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -39,7 +39,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.60.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index bf65d1c1a507..f757326c7da8 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.22.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce49..b8c6fa4b868a 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 688d1445e8ef..025f8a7f2aba 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.15.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd March 21, 2004
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index f81aaab04d6b..587d73f3c1fd 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -39,7 +39,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.20.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
index 3f6b78e54e11..783457c90a07 100644
--- a/bin/setfacl/Makefile
+++ b/bin/setfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith 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 5996d55daf60..16e2c4f289c3 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.5.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index 547830279cce..6d03c2e1ef93 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.8.22.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index 0a42eecb74c3..c3fa59bbdbc5 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.8.22.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index e6feef9beada..bc2db923fb16 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.6.22.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 9fa30743116b..faf4e801093e 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.19.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd May 13, 2010
 .Dt SETFACL 1
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index 2835ba894c49..1b84f4e35196 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.14.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h
index 290ac5b4d1d1..8f3e0cde52a8 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.5.22.3.2.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #ifndef _SETFACL_H
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index a7fb6a61bc55..b77162cd0de7 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.6.22.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 337264b54b0c..627d659a5135 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.47.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	sh
 INSTALLFLAGS= -S
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index af2773a4b973..ad016f9b6574 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.7.10.1.4.1 2010/06/14 02:09:06 kensmith 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 2edfe95eb459..989cf707e26e 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -36,7 +36,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.25.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a6bd23d79caf..f5d2dcb487b9 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 41bc76fa2c7e..00bba0c33baa 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.12.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include "shell.h"
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 542fc445a8a7..ea1ae84428dc 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -38,7 +38,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.22.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index f0d9cb34c412..f1f6466fae7b 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -38,7 +38,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.24.10.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <string.h>
 
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index c4bf8b64c377..e1cc14cf6851 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.14.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 83f233704fd2..e9ea87df8356 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.15.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 457a4c7aefc8..d44e589c5cb0 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.14.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * Echo command.
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index 75f83b54e526..9cfd28ef0caf 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.19.10.1.4.1 2010/06/14 02:09:06 kensmith 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 66c1908f2457..24fd02dd7ec3 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -36,7 +36,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.36.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 0a2d48999e7b..0f24f81b47d0 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -26,7 +26,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.7.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 char	*getpwd(void);
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 0c981a3eff92..2dfa79704787 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -36,7 +36,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.26.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * Errors and exceptions.
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 4611821644dd..1ce4c2688479 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.17.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 7978b84f051e..27b33a07d5ab 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -36,7 +36,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.64.2.2.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index c82585ea888f..ea20adfacde1 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.13.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 810782166a9f..aff948dfcb71 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -36,7 +36,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.34.2.2.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index e3b9acdd84d7..a6b949dba990 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.15.10.2.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 37957f5008d7..b5f4404a21ef 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -38,7 +38,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.55.2.2.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 2b895193d57a..59fe95510a1e 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.12.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 2b92c60ce217..6226f484e24e 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index 95f6857dce4c..b5aab097b80e 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith 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 16f0c9b9a95f..a07c11bf5cef 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith 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 68802a06d9f8..4462a2cc3272 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith 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 57ac1cec4cf4..3905c4f101e3 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -32,6 +32,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index bc1cd5c8fefe..ed0d33bab23b 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith 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 9e31f2a20f8d..6839feac8705 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith 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 81bb53d35edf..cad815de6860 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.8.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 32b0448d2b3a..19be0ab753dd 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -36,7 +36,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.31.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 1ec834374780..afa7c2b35950 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 void init(void);
diff --git a/bin/sh/input.c b/bin/sh/input.c
index f709b8c0218b..31c6f86c9e76 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -36,7 +36,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.25.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 4d57b3bf0518..0f0a02c99f3f 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.10.2.1.4.1 2010/06/14 02:09:06 kensmith 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 be9acab565a4..7b91a613ecb3 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -36,7 +36,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.72.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index c75c35355121..20efd2972fc1 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.19.10.1.4.1 2010/06/14 02:09:06 kensmith 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 fe03a730bce2..40d8361da76d 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -36,7 +36,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.14.10.1.4.1 2010/06/14 02:09:06 kensmith 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 f88324c628bd..c9eae13333e7 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 42756e881bae..d446b05d2b23 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -42,7 +42,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.31.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index 7f8c3940b602..fe2221b102e2 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index fa03632f6861..4a754cab7fe1 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -36,7 +36,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.28.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index 4652e5411593..3c135aff510b 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.11.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index a663c7535a55..425f723b2a81 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -36,7 +36,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.41.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 7b77649de415..f3410b9be0ce 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.16.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 022eed4eafc4..17de140a7190 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -42,7 +42,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.19.2.1.4.1 2010/06/14 02:09:06 kensmith 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 1a177f89531b..0813ba043871 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -42,7 +42,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.18.2.2.4.1 2010/06/14 02:09:06 kensmith 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 f8fad0d6db53..8eae56308476 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -42,7 +42,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.26.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index bdc873e44407..488317bdc32e 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.10.22.1.4.1 2010/06/14 02:09:06 kensmith 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 5d96587cdba2..ce55e901f17a 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.10.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 6eaacb35dc9b..0830beb81dc9 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -36,7 +36,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.13.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * String functions.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 1b27a1b008a8..29ee4dfc6b4e 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.8.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 1f5adbbae4ae..1630fd4a8e0e 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.15.30.2.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index e1e1b04c3286..b3d492eb0489 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.10.22.1.4.1 2010/06/14 02:09:06 kensmith 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 fea95ca28c68..baa14c85aba3 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -36,7 +36,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.27.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 3b827d16016d..2fbbaf188ae2 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.13.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 0d55fdfcb28e..4d484e0a14e2 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -36,7 +36,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.21.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/sh/output.h b/bin/sh/output.h
index bafd8687b159..7eecd4c0b5d6 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.13.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index cbd66bc0bd1b..c51ab48b80dc 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -36,7 +36,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.63.2.4.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 40dd8bda2405..f01bccfe9210 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.12.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 695e1507255c..8dbfdfc66b24 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -36,7 +36,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.27.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index ad44c4eddd8c..79afca803081 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.10.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 4f89d2f6a722..e1b513c3e827 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.130.2.5.2.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd January 8, 2010
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 81ad42473a19..112589e7a3bc 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.18.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #ifndef SHELL_H_
diff --git a/bin/sh/show.c b/bin/sh/show.c
index baae549c4295..c9a121de5ed6 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -36,7 +36,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.23.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 83f84afcc8af..a918732e3a7f 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.11.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index a0cd0ba14cdd..6370f8213c71 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -36,7 +36,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.34.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 672ad08d481f..6270367524bf 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.13.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 3188b28f6156..25720d58c6b8 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -36,7 +36,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.39.2.3.2.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index c1f994b8cb8d..ea92a1038c88 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.14.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 4ff73308c45b..3dcbaa1d8bcf 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index bc56dbf6471b..30c1a85a0416 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.22.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index f38b183cb2bf..0ee0e2d37bcf 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -39,7 +39,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.20.10.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae..8e657759bf8b 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.36.1.4.1 2010/06/14 02:09:06 kensmith 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 37617ce83a8d..51ac08fe64df 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -33,7 +33,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.14.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 8d0657cd0a9f..2cf1e12c7cc3 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/extern.h,v 1.10.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 int	c_cchars(const void *, const void *);
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 339da5970684..cb5727f96c49 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -33,7 +33,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.21.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 413f4d58dfa9..f35780010260 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -33,7 +33,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.20.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index cc18d2cd4959..b32f0c4a86e6 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -33,7 +33,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.14.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 63b30b360734..97798127e19d 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -33,7 +33,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.22.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 6cecfd6b0581..6d8783ef3921 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.34.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd August 23, 2008
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index f6daaf076ad8..4a3a426313ef 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -39,7 +39,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.23.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 77b85225f6cb..34bc78eb44ae 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/stty.h,v 1.9.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 5a4f0cfa47d0..6bd666ac22d7 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -33,7 +33,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.11.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 72c664f4afdd..4c593981d42e 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.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	sync
 MAN=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index cc53e1ae1eb2..02288e597aaa 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.16.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index d360245973de..9416e3d3f4ed 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -39,7 +39,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.16.22.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 7c64b40347ef..d203a1b83832 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.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index 4fe352487605..1bf7f3b02149 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.README,v 1.5.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index afa1c91f158a..1e851ddfe7b9 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.56.1.4.1 2010/06/14 02:09:06 kensmith 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 6dd16bc98993..312f73d569b1 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -28,7 +28,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.9.2.1.4.1 2010/06/14 02:09:06 kensmith 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 6b0ca789cd54..be746513f8a3 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.27.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd July 31, 2006
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index d7d1eec39b36..d28f71a91598 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.54.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile
index 370241d3ebdd..095a3f59b10e 100644
--- a/bin/uuidgen/Makefile
+++ b/bin/uuidgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4.4.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 
 PROG=	uuidgen
 WARNS?=	6
diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1
index 58dff699cecb..a0cc23016c11 100644
--- a/bin/uuidgen/uuidgen.1
+++ b/bin/uuidgen/uuidgen.1
@@ -22,7 +22,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/uuidgen/uuidgen.1,v 1.7.8.1.4.1 2010/06/14 02:09:06 kensmith Exp $
 .\"
 .Dd September 7, 2005
 .Dt UUIDGEN 1
diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c
index d5dac4bcacfb..c3bdedb3b5d5 100644
--- a/bin/uuidgen/uuidgen.c
+++ b/bin/uuidgen/uuidgen.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/uuidgen/uuidgen.c,v 1.3.30.1.4.1 2010/06/14 02:09:06 kensmith Exp $");
 
 #include <err.h>
 #include <stdio.h>