release/7.1.0_cvs

author: Ken Smith <kensmith@FreeBSD.org> 2008-12-31 22:57:14 +0000
committer: Ken Smith <kensmith@FreeBSD.org> 2008-12-31 22:57:14 +0000
commit: 8d4eb975d2e49f56d057a19aac09bcb92b3e71f7 (patch)
tree: 1b808490e2ba26bfe983f82bd41a2b36a6127322 /sbin
parent: a1fc2b0c89a1dd2ca090ae990ab45b21363ab76e (diff)
539 files changed, 550 insertions, 550 deletions
diff --git a/sbin/Makefile b/sbin/Makefile
index 31744644a4a7..e50d043817b8 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile,v 1.168.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 70d658416ea9..58aa93fe73cc 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile.inc,v 1.15.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9b..944a57e94688 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/adjkerntz/Makefile,v 1.6.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=   adjkerntz
 MAN=	adjkerntz.8
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 5591f2e10b76..6571a809ed5a 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.29.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 35d8da9d6c51..8d29278f13f6 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.32.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  * Andrey A. Chernov   <ache@astral.msk.su>    Dec 20 1993
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 73b916080d42..39d99ab22d15 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sbin/atacontrol/Makefile,v 1.8.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	atacontrol
 MAN=	atacontrol.8
diff --git a/sbin/atacontrol/atacontrol.8 b/sbin/atacontrol/atacontrol.8
index 8b4967e82549..5b2303f0da0e 100644
--- a/sbin/atacontrol/atacontrol.8
+++ b/sbin/atacontrol/atacontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.28.2.3.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 25, 2008
 .Dt ATACONTROL 8
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index 030f82566b7e..6997dbb584ef 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.c
@@ -23,7 +23,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/sbin/atacontrol/atacontrol.c,v 1.43.2.3.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index 4145d219e635..7bf539689e3a 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile,v 1.6.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 SUBDIR=	atmconfig
 
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 3d5738afdbc4..18f0343135b3 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -21,6 +21,6 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile.inc,v 1.5.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 1db0fa46dc00..9390cf03b4b2 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -3,7 +3,7 @@
 #	All rights reserved.
 # Author: Harti Brandt <brandt@fokus.gmd.de>
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	atmconfig
 .ifndef RESCUE
diff --git a/sbin/atm/atmconfig/atm_oid.list b/sbin/atm/atmconfig/atm_oid.list
index ca64afa44267..4dfe9bbcaedd 100644
--- a/sbin/atm/atmconfig/atm_oid.list
+++ b/sbin/atm/atmconfig/atm_oid.list
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atm_oid.list,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $
 begemotAtmIfTable
 begemotAtmIfName
 begemotAtmIfNodeId
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index 1ff76a100cd8..a83faef2d7b7 100644
--- a/sbin/atm/atmconfig/atmconfig.8
+++ b/sbin/atm/atmconfig/atmconfig.8
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/atmconfig/atmconfig.8,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 11, 2003
 .Dt ATMCONFIG 8
diff --git a/sbin/atm/atmconfig/atmconfig.h b/sbin/atm/atmconfig/atmconfig.h
index 5e5b04172cb0..9ab1bdacd3f0 100644
--- a/sbin/atm/atmconfig/atmconfig.h
+++ b/sbin/atm/atmconfig/atmconfig.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/atmconfig.h,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 #ifndef _ATMCONFIG_H
 #define	_ATMCONFIG_H
diff --git a/sbin/atm/atmconfig/atmconfig.help b/sbin/atm/atmconfig/atmconfig.help
index 8c6e7cec7f2f..0365393cd906 100644
--- a/sbin/atm/atmconfig/atmconfig.help
+++ b/sbin/atm/atmconfig/atmconfig.help
@@ -31,7 +31,7 @@
 #
 # Help file for the atmconfig utility
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atmconfig.help,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 #
 ^0 intro
 ATM configuration utility.
diff --git a/sbin/atm/atmconfig/atmconfig_device.c b/sbin/atm/atmconfig/atmconfig_device.c
index 082494df95a5..dd018879d5de 100644
--- a/sbin/atm/atmconfig/atmconfig_device.c
+++ b/sbin/atm/atmconfig/atmconfig_device.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.c,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "atmconfig.h"
 #include "atmconfig_device.h"
diff --git a/sbin/atm/atmconfig/atmconfig_device.h b/sbin/atm/atmconfig/atmconfig_device.h
index 1c099fcdc79a..74659407ae0b 100644
--- a/sbin/atm/atmconfig/atmconfig_device.h
+++ b/sbin/atm/atmconfig/atmconfig_device.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.h,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 #ifndef ATMCONFIG_DEVICE_H_
 #define ATMCONFIG_DEVICE_H_
diff --git a/sbin/atm/atmconfig/atmconfig_device.help b/sbin/atm/atmconfig/atmconfig_device.help
index 27237c8cb7b9..2e4c5bdfb2ca 100644
--- a/sbin/atm/atmconfig/atmconfig_device.help
+++ b/sbin/atm/atmconfig/atmconfig_device.help
@@ -27,7 +27,7 @@
 #
 # Help file for the atmconfig utility
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.help,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $
 #
 ^0 device
 ^^  device	show information about ATM hardware interfaces
diff --git a/sbin/atm/atmconfig/diag.c b/sbin/atm/atmconfig/diag.c
index 699d5ccf2f6b..9750476e3389 100644
--- a/sbin/atm/atmconfig/diag.c
+++ b/sbin/atm/atmconfig/diag.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/diag.c,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/diag.h b/sbin/atm/atmconfig/diag.h
index 8b36cd44e1f5..ab5af1701728 100644
--- a/sbin/atm/atmconfig/diag.h
+++ b/sbin/atm/atmconfig/diag.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/diag.h,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 struct diagif {
diff --git a/sbin/atm/atmconfig/main.c b/sbin/atm/atmconfig/main.c
index d2543f7d1f36..969d1267c280 100644
--- a/sbin/atm/atmconfig/main.c
+++ b/sbin/atm/atmconfig/main.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/main.c,v 1.4.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/natm.c b/sbin/atm/atmconfig/natm.c
index 29f5ce231e0a..e836761e50da 100644
--- a/sbin/atm/atmconfig/natm.c
+++ b/sbin/atm/atmconfig/natm.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/natm.c,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/atmconfig/private.h b/sbin/atm/atmconfig/private.h
index 9dcf53979517..80e415b71360 100644
--- a/sbin/atm/atmconfig/private.h
+++ b/sbin/atm/atmconfig/private.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/private.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77..2b9833351d32 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/badsect/Makefile,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	badsect
 DPADD=	${LIBUFS}
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 293e9589a281..612575a54bf3 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.23.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 93891714c193..0494c8a6097c 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/badsect/badsect.c,v 1.21.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  * badsect
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index a412493bb4ef..1c43e5d71c29 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index a0bb82ee4e54..f2876a7eaf0f 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.17.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index fbcf75b233cc..53bd319490c2 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.68.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 8, 2007
 .Dt BSDLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index bcba1253751d..922962c73cdd 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.112.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <stdint.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index c8a9ef362e54..ba0987c1cd78 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/bsdlabel/pathnames.h,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/bsdlabel/runtest.sh b/sbin/bsdlabel/runtest.sh
index 9d561f39ab82..c4c953cb8f0d 100644
--- a/sbin/bsdlabel/runtest.sh
+++ b/sbin/bsdlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/runtest.sh,v 1.5.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index 7a3d4213cbac..03b64a29b272 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.17.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	camcontrol
 SRCS=	camcontrol.c util.c
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 7925e947f92e..3690c4da2cab 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.44.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 21, 2006
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 9eab41c61d10..c6eb367d1c5e 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.58.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index eebbe8553ed5..bc75580a500e 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.4.32.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 3fb9587e206a..80213bebbba7 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.17.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 67f4e4f0cd15..191335c46c22 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -44,7 +44,7 @@
  * from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/util.c,v 1.10.28.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/stdint.h>
 #include <sys/types.h>
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index ac7558409ed6..aa9bb07ed9af 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ccdconfig
 WARNS?=	6
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index f5f4224b5e30..d655a59d979d 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.37.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 928aba5cb73a..9814c55bb264 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.37.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096d..554245d36f4a 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ccdconfig/pathnames.h,v 1.2.30.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #define _PATH_CCDCONF		"/etc/ccd.conf"
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index c68c312f269b..101f613cb2d4 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/clri/Makefile,v 1.6.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	clri
 MAN=	clri.8
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index c3c37960cbb2..cfc556764f86 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.14.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index dc77a41c66d5..17bb2c7334dd 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e..cbee23d7ccaa 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.4 (Berkeley) 6/5/91
-# $FreeBSD$
+# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	comcontrol
 MAN=	comcontrol.8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 87a7630582e3..33ac3beffe65 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.29.18.1 2008/11/25 02:59:29 kensmith Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 753ded36d1a9..c80b7ee5ae6c 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14.28.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index ddd2434e6cc5..0a8998724ce2 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/conscontrol/Makefile,v 1.5.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	conscontrol
 MAN=	conscontrol.8
diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8
index 726041e4087b..adc3fd4ded34 100644
--- a/sbin/conscontrol/conscontrol.8
+++ b/sbin/conscontrol/conscontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/conscontrol/conscontrol.8,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 23, 2001
 .Dt CONSCONTROL 8
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index d8e5bc52c11a..d6c1936a622b 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/conscontrol/conscontrol.c,v 1.4.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/ddb/Makefile b/sbin/ddb/Makefile
index b9189c1c0d9e..f88db0cce1a3 100644
--- a/sbin/ddb/Makefile
+++ b/sbin/ddb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ddb/Makefile,v 1.1.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ddb
 SRCS=	ddb.c ddb_capture.c ddb_script.c
diff --git a/sbin/ddb/ddb.8 b/sbin/ddb/ddb.8
index bfd6ccd1a721..0d12fd4145c2 100644
--- a/sbin/ddb/ddb.8
+++ b/sbin/ddb/ddb.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3.2.6.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 24, 2008
 .Dt DDB 8
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index f5c5dd026451..36ae852e4419 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/ddb/ddb.h b/sbin/ddb/ddb.h
index 8363bccfd889..2158a6e7ca84 100644
--- a/sbin/ddb/ddb.h
+++ b/sbin/ddb/ddb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ddb/ddb.h,v 1.1.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef DDB_H
diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c
index 9f83acbb03a5..2ef478fdb177 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c
index 13829049dbea..2c3d01d262d6 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb_script.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 8f52d902782c..ea02ba6c6123 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devd/Makefile,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8
index 7377e254759c..7b6d48c20230 100644
--- a/sbin/devd/devd.8
+++ b/sbin/devd/devd.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.17.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 24, 2005
 .Dt DEVD 8
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index c6ac80c65173..34b504c58461 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -34,7 +34,7 @@
 //	  - devd.conf needs more details on the supported statements.
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.33.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index c8de20f09944..0735d4f9a164 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .\" The section on comments was taken from named.conf.5, which has the
 .\" following copyright:
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index a8d113b03439..d36ef8a867e7 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.h,v 1.5.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef DEVD_H
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index a1ee9cd595d5..45b8fcb7ed02 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.hh,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef DEVD_HH
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 28b8a908adb1..b473e10db2af 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/parse.y,v 1.5.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "devd.h"
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 0fa78da4ebc3..0ce00aa0f25e 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/token.l,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6..f0757cb0a66c 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devfs/Makefile,v 1.2.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	devfs
 SRCS=	devfs.c rule.c
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index d9a00f0a7970..016d5be386ce 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 1, 2008
 .Dt DEVFS 8
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 0e7b66210121..28fcf30106e3 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/devfs.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index a9f8d224838d..ad0ba4f1907f 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devfs/extern.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef __DEVFS_H__
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index 25a7d289ad0f..a9cf06aaff32 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/rule.c,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 7e32326ff00a..69f15b7d71ec 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.9 2004/05/04 12:52:05 henning Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.24.18.1 2008/11/25 02:59:29 kensmith Exp $
 #
 # Copyright (c) 1996, 1997 The Internet Software Consortium.
 # All rights reserved.
diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index cd60ceca7d83..904400fc10b5 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/alloc.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 8a669e1befb3..f573c7e54abb 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/bpf.c,v 1.7.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 #include <sys/ioctl.h>
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 5d7084e74c79..f7195b2ecb55 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/clparse.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3c8932dbd5b2..fb3616a0257d 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/conflex.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index adca0929a07c..ccb295b278e5 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/convert.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script
index f6da4f6670ea..1957c3fe3e9f 100644
--- a/sbin/dhclient/dhclient-script
+++ b/sbin/dhclient/dhclient-script
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.17.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 #
 # Copyright (c) 2003 Kenneth R Westerback <krw@openbsd.org>
 #
diff --git a/sbin/dhclient/dhclient-script.8 b/sbin/dhclient/dhclient-script.8
index b04974bc1617..70249c792897 100644
--- a/sbin/dhclient/dhclient-script.8
+++ b/sbin/dhclient/dhclient-script.8
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient-script.8,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT-SCRIPT 8
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index 58f5ddd3ea05..dcf319b1f2fd 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.8,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 13, 2007
 .Dt DHCLIENT 8
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index d21608b1ec54..012c925ed7f2 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.21.2.3.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/dhclient.conf b/sbin/dhclient/dhclient.conf
index 7eaeeb8eb40a..968dc910ea46 100644
--- a/sbin/dhclient/dhclient.conf
+++ b/sbin/dhclient/dhclient.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient.conf,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 send host-name "andare.fugue.com";
 send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 167239ef63c3..79ab1de47424 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.conf.5,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT.CONF 5
diff --git a/sbin/dhclient/dhclient.leases.5 b/sbin/dhclient/dhclient.leases.5
index b1f0f3d8bd53..76bb85c0229d 100644
--- a/sbin/dhclient/dhclient.leases.5
+++ b/sbin/dhclient/dhclient.leases.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.leases.5,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT.LEASES 5
diff --git a/sbin/dhclient/dhcp-options.5 b/sbin/dhclient/dhcp-options.5
index 37356062ccac..d59754a090c6 100644
--- a/sbin/dhclient/dhcp-options.5
+++ b/sbin/dhclient/dhcp-options.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhcp-options.5,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 1, 1995
 .Dt DHCP-OPTIONS 5
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index e4fa9d174c1b..4e574056bacc 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/dhclient/dhcp.h,v 1.3.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $	*/
 
 /* Protocol structures... */
 
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 02766e0280ea..94bcc7a992be 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/dispatch.c,v 1.2.2.1.4.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index de3458322fda..7aa20c05e507 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/errwarn.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <errno.h>
 
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 040236ab735b..6233ed197837 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/hash.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index 4b7b1cef1bad..51c86f05e49a 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/inet.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 09aa4d8ffb64..f75fd8b537b2 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/options.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 484953ca2d98..276abe1c7323 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/packet.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 6a54fd0a4c88..6a12612ac0e5 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/parse.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index b42572f2895b..aa373908c6a2 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/privsep.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 81a9acc8e122..351be7a255b4 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/tables.c,v 1.4.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 0ed2919bb314..6c635a0fc919 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/tree.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 8472f56c461f..81f1950bbc7e 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dmesg/Makefile,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	dmesg
 MAN=	dmesg.8
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 9d05e6c70b75..d7a982a94109 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.19.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index f2e513f6106c..eb0b68af33ca 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.28.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570e..da7a85839c00 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dump/Makefile,v 1.24.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index 906ac2716959..68b689aff1e3 100644
--- a/sbin/dump/cache.c
+++ b/sbin/dump/cache.c
@@ -3,7 +3,7 @@
  *
  *	Block cache for dump
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/cache.c,v 1.2.30.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 6759bdaabdd4..9cae27c575e8 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.75.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 24, 2006
 .Dt DUMP 8
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index d467668b7e82..4ec779d329ad 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -28,7 +28,7 @@
  *
  *	@(#)dump.h	8.2 (Berkeley) 4/28/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/dump.h,v 1.28.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index dd02642bdbf6..ca818faf3eba 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.22.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index de880bbc030c..c0b33b2d4876 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/itime.c,v 1.16.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 827ffcc129f3..a5d5bc8e8b57 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/main.c,v 1.65.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 8fc255ae73c5..2c301603b654 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/optr.c,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index eb3ce3977af2..7ec50c2943ab 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/pathnames.h,v 1.9.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 913409fb7b01..1fed8f6b17dc 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/tape.c,v 1.27.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 211cfa6370b9..a50b9d4f9422 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/traverse.c,v 1.40.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 3720ebf550fd..cb65e5697bfc 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/unctime.c,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 99faa77ad725..85ddc7f54551 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	dumpfs
 DPADD=	${LIBUFS}
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 8879f783e3cb..59898d3743ed 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 19, 2003
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index e0b809e1b5e0..391200582cb2 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.44.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index c273f93470a2..c081ea15b408 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.10.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	dumpon
 WARNS?=	6
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index ff47bcb19479..0cdcbeea7de2 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 73d46b00eb3c..62391a149332 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -39,7 +39,7 @@ static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.24.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 6899c47c8356..270248515703 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/Makefile,v 1.12.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_mbr_enc.c
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 1537266a9798..efdaa91ea60c 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.39.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 30, 2007
 .Dt FDISK 8
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index e48457815c34..6a5591c2bcbd 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.84.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fdisk/runtest.sh b/sbin/fdisk/runtest.sh
index f25f4272bb0f..f369b45a3f6b 100644
--- a/sbin/fdisk/runtest.sh
+++ b/sbin/fdisk/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/runtest.sh,v 1.2.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 set -e
 MD=`mdconfig -a -t malloc -s 4m -x 63 -y 16`
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index e5932f8a2d36..56558fc461c8 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk_pc98/Makefile,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_pc98_enc.c
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index c33e78abfc3e..becc441759cc 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 30, 2007
 .Dt FDISK 8
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index 161c1f55a981..ab7c42014e0a 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.21.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index a1ffef7989a0..443a3a06b477 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -1,7 +1,7 @@
 # @(#)Makefile    8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7.26.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 GROWFS= ${.CURDIR}/../growfs
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index aacf4280bf13..f182ae3c0ea5 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 8, 2000
 .Dt FFSINFO 8
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 1570da5e5f90..8de9c94d2c4c 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -48,7 +48,7 @@ All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.13.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index bc445fda26f7..04c04fe59426 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.14 1996/09/27 22:38:37 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck/Makefile,v 1.11.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	fsck
 SRCS=	fsck.c fsutil.c preen.c
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index b7360d9bd8c0..973234940517 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.37.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 25, 2001
 .Dt FSCK 8
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 490a29af919a..7d4bd3dda30f 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsck.c,v 1.18.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index a4578bd63eb6..01948cdd8c87 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -33,7 +33,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $");
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsutil.c,v 1.8.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 84e72909592d..c377a59b60d1 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -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/sbin/fsck/fsutil.h,v 1.8.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 void perror(const char *);
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 6204685833f4..a479450f9763 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/preen.c,v 1.28.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index aaae685df149..255eda1dfe12 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
 PROG=	fsck_ffs
diff --git a/sbin/fsck_ffs/SMM.doc/0.t b/sbin/fsck_ffs/SMM.doc/0.t
index 5fe189dc471a..345ba593f80d 100644
--- a/sbin/fsck_ffs/SMM.doc/0.t
+++ b/sbin/fsck_ffs/SMM.doc/0.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/0.t,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"	@(#)0.t	8.1 (Berkeley) 6/8/93
 .\"
 .if n .ND
diff --git a/sbin/fsck_ffs/SMM.doc/1.t b/sbin/fsck_ffs/SMM.doc/1.t
index 3098b49f9576..f75ba723b979 100644
--- a/sbin/fsck_ffs/SMM.doc/1.t
+++ b/sbin/fsck_ffs/SMM.doc/1.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/1.t,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"	@(#)1.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Introduction
diff --git a/sbin/fsck_ffs/SMM.doc/2.t b/sbin/fsck_ffs/SMM.doc/2.t
index b294a6af3bec..f9a85204b1d8 100644
--- a/sbin/fsck_ffs/SMM.doc/2.t
+++ b/sbin/fsck_ffs/SMM.doc/2.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/2.t,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"	@(#)2.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Overview of the file system
diff --git a/sbin/fsck_ffs/SMM.doc/3.t b/sbin/fsck_ffs/SMM.doc/3.t
index 522a222c3dc3..91eb060c625e 100644
--- a/sbin/fsck_ffs/SMM.doc/3.t
+++ b/sbin/fsck_ffs/SMM.doc/3.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/3.t,v 1.7.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"	@(#)3.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Fixing corrupted file systems
diff --git a/sbin/fsck_ffs/SMM.doc/4.t b/sbin/fsck_ffs/SMM.doc/4.t
index 353fab3378fa..0f30e3b8c8cb 100644
--- a/sbin/fsck_ffs/SMM.doc/4.t
+++ b/sbin/fsck_ffs/SMM.doc/4.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/4.t,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"	@(#)4.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Appendix A \- Fsck_ffs Error Conditions
diff --git a/sbin/fsck_ffs/SMM.doc/Makefile b/sbin/fsck_ffs/SMM.doc/Makefile
index 9ddc06f097ae..77fa7a453f31 100644
--- a/sbin/fsck_ffs/SMM.doc/Makefile
+++ b/sbin/fsck_ffs/SMM.doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/SMM.doc/Makefile,v 1.2.32.1 2008/11/25 02:59:29 kensmith Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 DIR=	smm/03.fsck_ffs
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index da838b05c36a..48181ff5a7cd 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/dir.c,v 1.30.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 2cdf71e3ebeb..280843260627 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/ea.c,v 1.2.30.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index f9b38e0c27b8..8fe88d24c096 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index a64c7ce8b5e7..202c6ad9f7ee 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 24, 2001
 .Dt FSCK_FFS 8
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 65f996c1ced8..401e434f2e8d 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index 8785e41d82a1..e9add49ef7c2 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index b41d8430e81b..4d3fa8bfa934 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 607c5084a0cb..746226ed102f 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.47.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index f72887755ec2..641797c73b29 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index e635935fca00..8708888bcc93 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1b.c,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index c4fdd2a8a578..d5c13e3a4b7a 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 22309cbbde57..47a9c5632a69 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass3.c,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 8a426eaa081e..0b0975021553 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass4.c,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 173156efaf51..b10280265dec 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.43.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index bdf88b4b0dfd..f84444c59c75 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 8e6682034214..fe4b70b4aa7c 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/utilities.c,v 1.23.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index fd539b94f9d7..e35237e75f21 100644
--- a/sbin/fsck_msdosfs/Makefile
+++ b/sbin/fsck_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_msdosfs/Makefile,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 FSCK=	${.CURDIR}/../fsck
 .PATH: ${FSCK}
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 32ed8633e037..69989887ffc4 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: boot.c,v 1.9 2003/07/24 19:25:46 ws Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.4.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 48ae5ca20eb1..cf17839f7b0e 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: check.c,v 1.10 2000/04/25 23:02:51 jdolecek Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/check.c,v 1.10.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index b87a916c17ff..9ab4cb71896d 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -37,7 +37,7 @@
 #ifndef lint
 __RCSID("$NetBSD: dir.c,v 1.14 1998/08/25 19:18:15 ross Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 3a5d4394c506..664ae280d6bb 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -31,7 +31,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.
  *	$NetBSD: dosfs.h,v 1.4 1997/01/03 14:32:48 ws Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/dosfs.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef DOSFS_H
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 53127cf44ab4..7068aee6dbfc 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -29,7 +29,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.
  *	$NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/ext.h,v 1.10.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef EXT_H
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 0b0bd9e11e89..5c0ca6c9f7fc 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/fat.c,v 1.7.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/fsck_msdosfs.8 b/sbin/fsck_msdosfs/fsck_msdosfs.8
index 8631210cb4e6..5955615cb6fc 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -30,7 +30,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/sbin/fsck_msdosfs/fsck_msdosfs.8,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 13, 1995
 .Dt FSCK_MSDOSFS 8
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index eacc792d0323..0966daecf8e6 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.15.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 65333ef07252..8159625fc231 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsdb/Makefile,v 1.19.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 5fc6f2414b4c..bb3f1e262bce 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.32.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 24, 2006
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index f7354e86d9cc..f7395399fafc 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdb.c,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index ddd15153f5cb..a9bea66c9d05 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.12.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 extern int blread(int fd, char *buf, ufs2_daddr_t blk, long size);
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index d50c6c00d331..b00c1aa09d6f 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.20.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 7e2da62408e3..cbd8bf25da8c 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsirand/Makefile,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	fsirand
 WARNS?=	0
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 00f0eeee4c99..c96dac9279a5 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -27,7 +27,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: fsirand.8,v 1.6 1997/02/23 03:58:26 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsirand/fsirand.8,v 1.17.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index defdf5250d33..3366d6f36fc5 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsirand/fsirand.c,v 1.13.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 87058028533e..ba171e79044f 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/Makefile,v 1.11.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	gbde
 SRCS=	gbde.c template.c
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index 96bbb607d002..a0dc59944ca8 100644
--- a/sbin/gbde/gbde.8
+++ b/sbin/gbde/gbde.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gbde/gbde.8,v 1.15.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 8, 2006
 .Dt GBDE 8
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 0a1e740c4041..704bba7bebb1 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gbde/gbde.c,v 1.31.6.1 2008/11/25 02:59:29 kensmith Exp $
  *
  * XXX: Future stuff
  *
diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu
index 82e6f2e47489..99fa13d72b22 100644
--- a/sbin/gbde/image.uu
+++ b/sbin/gbde/image.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/gbde/image.uu,v 1.1.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 begin 644 gbde.image.bz2
 M0EIH.3%!629364"&9H\`Y1=_____________________________________
diff --git a/sbin/gbde/template.txt b/sbin/gbde/template.txt
index 3d22007befd9..151452510dec 100644
--- a/sbin/gbde/template.txt
+++ b/sbin/gbde/template.txt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/template.txt,v 1.1.32.1 2008/11/25 02:59:29 kensmith Exp $
 #
 # Sector size is the smallest unit of data which can be read or written.
 # Making it too small decreases performance and decreases available space.
diff --git a/sbin/gbde/test.sh b/sbin/gbde/test.sh
index 0aeb05c907c8..88c5c360c110 100644
--- a/sbin/gbde/test.sh
+++ b/sbin/gbde/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/test.sh,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 set -e
 
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 95f00d914756..a2ad7fe49448 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/Makefile,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 SUBDIR=	core class
 
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 94ca09f3889c..1d0d50acbf89 100644
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/Makefile.inc,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 WARNS?=	6
 CLASS_DIR?=/lib/geom
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index 7b556a8f2d33..84a4923f4011 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 63109c29df6a..20639b49a561 100644
--- a/sbin/geom/class/Makefile.inc
+++ b/sbin/geom/class/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile.inc,v 1.7.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 SHLIBDIR?=${CLASS_DIR}
 SHLIB_NAME?=geom_${CLASS}.so
diff --git a/sbin/geom/class/cache/Makefile b/sbin/geom/class/cache/Makefile
index 6ca37e6c05e8..fc7a853630a0 100644
--- a/sbin/geom/class/cache/Makefile
+++ b/sbin/geom/class/cache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/cache/Makefile,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/cache/geom_cache.c b/sbin/geom/class/cache/geom_cache.c
index 636c54119ce1..9f8ef7d64f37 100644
--- a/sbin/geom/class/cache/geom_cache.c
+++ b/sbin/geom/class/cache/geom_cache.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/cache/geom_cache.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index b3a3e23c449d..d88eb92a1e3e 100644
--- a/sbin/geom/class/concat/Makefile
+++ b/sbin/geom/class/concat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/concat/Makefile,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index 2e1b79dadd1a..ae9ae9bcab67 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 21, 2004
 .Dt GCONCAT 8
diff --git a/sbin/geom/class/concat/geom_concat.c b/sbin/geom/class/concat/geom_concat.c
index e1b7342a0376..ea07fb4bf327 100644
--- a/sbin/geom/class/concat/geom_concat.c
+++ b/sbin/geom/class/concat/geom_concat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.13.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 041e738465cf..56d9c55af0d4 100644
--- a/sbin/geom/class/eli/Makefile
+++ b/sbin/geom/class/eli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.3.8.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2
 
diff --git a/sbin/geom/class/eli/geli.8 b/sbin/geom/class/eli/geli.8
index d087e640eaea..15fd5412f44d 100644
--- a/sbin/geom/class/eli/geli.8
+++ b/sbin/geom/class/eli/geli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 16, 2006
 .Dt GELI 8
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index 46f1bce684a5..972299093b7f 100644
--- a/sbin/geom/class/eli/geom_eli.c
+++ b/sbin/geom/class/eli/geom_eli.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.24.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile
index 95f66de2085e..0fa773907074 100644
--- a/sbin/geom/class/journal/Makefile
+++ b/sbin/geom/class/journal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/journal/Makefile,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/journal/geom_journal.c b/sbin/geom/class/journal/geom_journal.c
index 37169990ac4e..32034251c286 100644
--- a/sbin/geom/class/journal/geom_journal.c
+++ b/sbin/geom/class/journal/geom_journal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/sbin/geom/class/journal/geom_journal.h b/sbin/geom/class/journal/geom_journal.h
index 63d35b487926..96695a290d45 100644
--- a/sbin/geom/class/journal/geom_journal.h
+++ b/sbin/geom/class/journal/geom_journal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/class/journal/geom_journal.h,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef	_GEOM_JOURNAL_H_
diff --git a/sbin/geom/class/journal/geom_journal_ufs.c b/sbin/geom/class/journal/geom_journal_ufs.c
index c847a880d64b..63f7a21c13f6 100644
--- a/sbin/geom/class/journal/geom_journal_ufs.c
+++ b/sbin/geom/class/journal/geom_journal_ufs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal_ufs.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/geom/class/journal/gjournal.8 b/sbin/geom/class/journal/gjournal.8
index eb4f517b1f4d..b5cdace20521 100644
--- a/sbin/geom/class/journal/gjournal.8
+++ b/sbin/geom/class/journal/gjournal.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.1.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 13, 2008
 .Dt GJOURNAL 8
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index cba7ac6b4483..869438ee5858 100644
--- a/sbin/geom/class/label/Makefile
+++ b/sbin/geom/class/label/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/label/Makefile,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index 9e27eec376e8..e3650d94ac6d 100644
--- a/sbin/geom/class/label/geom_label.c
+++ b/sbin/geom/class/label/geom_label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/label/geom_label.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index cbff2b467ef2..48e0c9b169d9 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 2, 2004
 .Dt GLABEL 8
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index f07a790539b6..4ce115cea2f9 100644
--- a/sbin/geom/class/mirror/Makefile
+++ b/sbin/geom/class/mirror/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/mirror/Makefile,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index 38912a34958b..48a1b42a9433 100644
--- a/sbin/geom/class/mirror/geom_mirror.c
+++ b/sbin/geom/class/mirror/geom_mirror.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.17.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index 185b3d3838c1..ae019ae02753 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.23.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 1, 2006
 .Dt GMIRROR 8
diff --git a/sbin/geom/class/multipath/Makefile b/sbin/geom/class/multipath/Makefile
index b4eb7837e8eb..3f26ac17e923 100644
--- a/sbin/geom/class/multipath/Makefile
+++ b/sbin/geom/class/multipath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/multipath/Makefile,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 CLASS=	multipath
diff --git a/sbin/geom/class/multipath/geom_multipath.c b/sbin/geom/class/multipath/geom_multipath.c
index 1bb3f32239a2..60adb751fd8f 100644
--- a/sbin/geom/class/multipath/geom_multipath.c
+++ b/sbin/geom/class/multipath/geom_multipath.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/multipath/geom_multipath.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $");
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/sbin/geom/class/multipath/gmultipath.8 b/sbin/geom/class/multipath/gmultipath.8
index 8c354e42bd65..ec081dd18be7 100644
--- a/sbin/geom/class/multipath/gmultipath.8
+++ b/sbin/geom/class/multipath/gmultipath.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/multipath/gmultipath.8,v 1.4.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 26, 2007
 .Dt GMULTIPATH 8
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 75a20376ff45..3a65cdc1fce8 100644
--- a/sbin/geom/class/nop/Makefile
+++ b/sbin/geom/class/nop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/nop/Makefile,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index 7306add3674b..fca9a308065d 100644
--- a/sbin/geom/class/nop/geom_nop.c
+++ b/sbin/geom/class/nop/geom_nop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/nop/geom_nop.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index 83c33232647b..f18dbbc3a5f8 100644
--- a/sbin/geom/class/nop/gnop.8
+++ b/sbin/geom/class/nop/gnop.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.21.2.1.4.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 8, 2006
 .Dt GNOP 8
diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile
index 36227162a1f4..27ed4655dc74 100644
--- a/sbin/geom/class/part/Makefile
+++ b/sbin/geom/class/part/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index aa14b694867b..6bfa734cd8b2 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.1.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/stat.h>
 
diff --git a/sbin/geom/class/part/gpart.8 b/sbin/geom/class/part/gpart.8
index 6deea8cd2ab3..5566f6d1c287 100644
--- a/sbin/geom/class/part/gpart.8
+++ b/sbin/geom/class/part/gpart.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/part/gpart.8,v 1.1.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd Nov 18, 2008
 .Dt GPART 8
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 1791669dec92..cdc5f8e13618 100644
--- a/sbin/geom/class/raid3/Makefile
+++ b/sbin/geom/class/raid3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/raid3/Makefile,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index 4a2dbe201ef2..b2b5d70f2d93 100644
--- a/sbin/geom/class/raid3/geom_raid3.c
+++ b/sbin/geom/class/raid3/geom_raid3.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.20.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/raid3/graid3.8 b/sbin/geom/class/raid3/graid3.8
index 21c6f181e773..1b54a21e3f4e 100644
--- a/sbin/geom/class/raid3/graid3.8
+++ b/sbin/geom/class/raid3/graid3.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 1, 2006
 .Dt GRAID3 8
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index ea38f159241a..e2bb49054998 100644
--- a/sbin/geom/class/shsec/Makefile
+++ b/sbin/geom/class/shsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/shsec/Makefile,v 1.1.20.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/shsec/geom_shsec.c b/sbin/geom/class/shsec/geom_shsec.c
index 8af47ee62d1f..6eb1b9a73145 100644
--- a/sbin/geom/class/shsec/geom_shsec.c
+++ b/sbin/geom/class/shsec/geom_shsec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/shsec/geom_shsec.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/shsec/gshsec.8 b/sbin/geom/class/shsec/gshsec.8
index 67dff5d59616..16b4728b8e10 100644
--- a/sbin/geom/class/shsec/gshsec.8
+++ b/sbin/geom/class/shsec/gshsec.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/shsec/gshsec.8,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 8, 2005
 .Dt GSHSEC 8
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 53a35fff46bf..8af3a17e4b32 100644
--- a/sbin/geom/class/stripe/Makefile
+++ b/sbin/geom/class/stripe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/stripe/Makefile,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/stripe/geom_stripe.c b/sbin/geom/class/stripe/geom_stripe.c
index 13243c7505a5..c02409667bb0 100644
--- a/sbin/geom/class/stripe/geom_stripe.c
+++ b/sbin/geom/class/stripe/geom_stripe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index ee70184bdb3a..85d5e82bcd4c 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.25.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 21, 2004
 .Dt GSTRIPE 8
diff --git a/sbin/geom/class/virstor/Makefile b/sbin/geom/class/virstor/Makefile
index 0b4d5cdda31b..2cb3ac939baf 100644
--- a/sbin/geom/class/virstor/Makefile
+++ b/sbin/geom/class/virstor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/virstor/Makefile,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
 
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c
index 6b29bbe16fc5..7c3b9ab0861c 100644
--- a/sbin/geom/class/virstor/geom_virstor.c
+++ b/sbin/geom/class/virstor/geom_virstor.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/virstor/gvirstor.8 b/sbin/geom/class/virstor/gvirstor.8
index 5807af925933..bab56128bcae 100644
--- a/sbin/geom/class/virstor/gvirstor.8
+++ b/sbin/geom/class/virstor/gvirstor.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/virstor/gvirstor.8,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 8, 2006
 .Dt GVIRSTOR 8
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index d76c35b0512d..fab536fe91cf 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/core/Makefile,v 1.10.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../misc
 
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index e308cfb9a4c9..24b96bfcab9c 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.19.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 21, 2004
 .Dt GEOM 8
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index dc3d05e91e3c..74c4228b01b5 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.32.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h
index e79e8559cf03..13eedb5180b0 100644
--- a/sbin/geom/core/geom.h
+++ b/sbin/geom/core/geom.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/core/geom.h,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _GEOM_H_
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index 64df7c6845ed..270d1b01b5df 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.7.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h
index c3242a3bdc9b..049e5503ada7 100644
--- a/sbin/geom/misc/subr.h
+++ b/sbin/geom/misc/subr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/misc/subr.h,v 1.8.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _SUBR_H_
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 38ca2f2d0979..6ea1fe28884b 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc
index e55271f7ddc5..65cec4fc35a5 100644
--- a/sbin/ggate/Makefile.inc
+++ b/sbin/ggate/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile.inc,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 WARNS?=	6
 
diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile
index 4d8917f3164c..16c7f14d6ac4 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 09f0444fa6a5..b5d0466e2d15 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggatec/ggatec.8,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEC 8
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index e421614dc6a3..5f093f6ccb1f 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index 4e7708ebffa3..1c655c83e292 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.5.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 3024a04230d7..1932fa000692 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggated/ggated.8,v 1.4.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 29, 2004
 .Dt GGATED 8
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index b211ccc8592c..5ec83d2d67e5 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index 604a75480313..73cff329b8da 100644
--- a/sbin/ggate/ggatel/Makefile
+++ b/sbin/ggate/ggatel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.4.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 01b964a947e6..1e26612d18e1 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.5.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEL 8
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 03979c3f9f72..b566f40a3409 100644
--- a/sbin/ggate/ggatel/ggatel.c
+++ b/sbin/ggate/ggatel/ggatel.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggatel/ggatel.c,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index dd40790120d1..26611e65779b 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/shared/ggate.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index 3e26253c360c..bcebf4650722 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/shared/ggate.h,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _GGATE_H_
diff --git a/sbin/gpt/Makefile b/sbin/gpt/Makefile
index b619b00f3002..ec9b9776a23c 100644
--- a/sbin/gpt/Makefile
+++ b/sbin/gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.7.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	gpt
 SRCS=	add.c boot.c create.c destroy.c gpt.c label.c map.c migrate.c \
diff --git a/sbin/gpt/add.c b/sbin/gpt/add.c
index b2c20a0302b9..7fa56167b4a8 100644
--- a/sbin/gpt/add.c
+++ b/sbin/gpt/add.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/boot.c b/sbin/gpt/boot.c
index b4a151acce4b..af8e3e594a52 100644
--- a/sbin/gpt/boot.c
+++ b/sbin/gpt/boot.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/boot.c,v 1.2.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/sbin/gpt/create.c b/sbin/gpt/create.c
index 24a6a6d014fb..6429f8ca6183 100644
--- a/sbin/gpt/create.c
+++ b/sbin/gpt/create.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/destroy.c b/sbin/gpt/destroy.c
index 7c2c198608bc..937b75701318 100644
--- a/sbin/gpt/destroy.c
+++ b/sbin/gpt/destroy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/destroy.c,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/gpt.8 b/sbin/gpt/gpt.8
index 0e3acef2f999..7d35b3e21d21 100644
--- a/sbin/gpt/gpt.8
+++ b/sbin/gpt/gpt.8
@@ -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/sbin/gpt/gpt.8,v 1.17.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 5, 2008
 .Os
diff --git a/sbin/gpt/gpt.c b/sbin/gpt/gpt.c
index 34258a6ac8d6..079ce05fbe98 100644
--- a/sbin/gpt/gpt.c
+++ b/sbin/gpt/gpt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.h b/sbin/gpt/gpt.h
index 857eaf0901d7..ed940393d888 100644
--- a/sbin/gpt/gpt.h
+++ b/sbin/gpt/gpt.h
@@ -23,7 +23,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/sbin/gpt/gpt.h,v 1.11.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _GPT_H_
diff --git a/sbin/gpt/label.c b/sbin/gpt/label.c
index 4a793cd1cc12..187ab7d69b5f 100644
--- a/sbin/gpt/label.c
+++ b/sbin/gpt/label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/map.c b/sbin/gpt/map.c
index 91b56850b9c4..5f75553a68fe 100644
--- a/sbin/gpt/map.c
+++ b/sbin/gpt/map.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/map.c,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/sbin/gpt/map.h b/sbin/gpt/map.h
index 4c3f0992d59a..1350f2a57415 100644
--- a/sbin/gpt/map.h
+++ b/sbin/gpt/map.h
@@ -23,7 +23,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/sbin/gpt/map.h,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef _MAP_H_
diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c
index 798949dcfdb9..6d4753b0a6ad 100644
--- a/sbin/gpt/migrate.c
+++ b/sbin/gpt/migrate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/recover.c b/sbin/gpt/recover.c
index dd13a64951ed..b13f3de95d17 100644
--- a/sbin/gpt/recover.c
+++ b/sbin/gpt/recover.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/remove.c b/sbin/gpt/remove.c
index 381ff0b8217f..ce851670bef3 100644
--- a/sbin/gpt/remove.c
+++ b/sbin/gpt/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/show.c b/sbin/gpt/show.c
index 9531288346df..36ec23f189f9 100644
--- a/sbin/gpt/show.c
+++ b/sbin/gpt/show.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index a5e9937e8f16..37a0770dc5ad 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/growfs/Makefile,v 1.13.18.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 #GFSDBG=
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 15effec81587..fa2fb260fa49 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/growfs/debug.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 3cad9d97874c..b55b3a4e3a32 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/growfs/debug.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  *
  */
 
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 387e5114bdc0..b4e2b5f3cc25 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/growfs/growfs.8,v 1.24.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 8, 2000
 .Dt GROWFS 8
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 89b14dac27f6..83f3d9c14baf 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -47,7 +47,7 @@ All rights reserved.\n";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/growfs/growfs.c,v 1.25.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /* ********************************************************** INCLUDES ***** */
 #include <sys/param.h>
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 6d414974dba1..92681f49d697 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gvinum/Makefile,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
diff --git a/sbin/gvinum/gvinum.8 b/sbin/gvinum/gvinum.8
index 83b6876df36d..4d3c7c31fc2f 100644
--- a/sbin/gvinum/gvinum.8
+++ b/sbin/gvinum/gvinum.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gvinum/gvinum.8,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd March 23, 2006
 .Dt GVINUM 8
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index ea33b75e1adc..283f518d7bec 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index d1b45a07749b..fa7d8c0d6720 100644
--- a/sbin/gvinum/gvinum.h
+++ b/sbin/gvinum/gvinum.h
@@ -34,6 +34,6 @@
  * advised of the possibility of such damage.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/gvinum/gvinum.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $ */
 
 #define GVINUMMOD	"geom_vinum"
diff --git a/sbin/idmapd/Makefile b/sbin/idmapd/Makefile
index 8206e0d9bb81..f059e519a25d 100644
--- a/sbin/idmapd/Makefile
+++ b/sbin/idmapd/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/idmapd/Makefile,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	idmapd
 MAN=	idmapd.8
diff --git a/sbin/idmapd/idmapd.8 b/sbin/idmapd/idmapd.8
index 1fb62168c6eb..0a57d3c900a7 100644
--- a/sbin/idmapd/idmapd.8
+++ b/sbin/idmapd/idmapd.8
@@ -20,7 +20,7 @@
 .\" connection with the use of the software, even if it has been or is hereafter
 .\" advised of the possibility of such damages.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/idmapd/idmapd.8,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 15, 2006
 .Dt IDMAPD 8
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c
index fa3a082d3ddb..4432dc50fa04 100644
--- a/sbin/idmapd/idmapd.c
+++ b/sbin/idmapd/idmapd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $ */
 /* $Id: idmapd.c,v 1.5 2003/11/05 14:58:58 rees Exp $ */
 
 /*
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index ead847d87df5..a63cf5242cd8 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.33.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ifconfig/af_atalk.c b/sbin/ifconfig/af_atalk.c
index 9accc75fdc19..72bdc060d0e5 100644
--- a/sbin/ifconfig/af_atalk.c
+++ b/sbin/ifconfig/af_atalk.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_atalk.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 1720b1981d87..028951c72a2c 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_inet.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index f1871fb4996c..54d039a1f66d 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_inet6.c,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/af_ipx.c b/sbin/ifconfig/af_ipx.c
index bc5d500dac76..422de632430d 100644
--- a/sbin/ifconfig/af_ipx.c
+++ b/sbin/ifconfig/af_ipx.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index f77515e5115e..87625b9843ae 100644
--- a/sbin/ifconfig/af_link.c
+++ b/sbin/ifconfig/af_link.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_link.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index 65c33173cc73..17121ad45afb 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.11.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifcarp.c b/sbin/ifconfig/ifcarp.c
index 36f1bb6a47b7..47adb2506a8a 100644
--- a/sbin/ifconfig/ifcarp.c
+++ b/sbin/ifconfig/ifcarp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sbin/ifconfig/ifcarp.c,v 1.2.20.1 2008/11/25 02:59:29 kensmith Exp $ */
 /*	from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
 
 /*
diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c
index bf68d563b8e1..6a9e1670a074 100644
--- a/sbin/ifconfig/ifclone.c
+++ b/sbin/ifconfig/ifclone.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifclone.c,v 1.3.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 9948c6436541..511e8b169e6e 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.142.2.6.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 20, 2008
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 4819679bdd02..01f3467afe49 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.134.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 70c1cadb1b45..7e67a03a07c2 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -31,7 +31,7 @@
  *
  * so there!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.21.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #define	__constructor	__attribute__((constructor))
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index 818340bb7249..1ddb11af4256 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifgre.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index 88774a6ae485..ebf33cde1e88 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifgroup.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 0b7d0432f44c..5384e8b5b8c2 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.47.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /*-
diff --git a/sbin/ifconfig/iflagg.c b/sbin/ifconfig/iflagg.c
index 5eaea98b34e1..f1ed965cb173 100644
--- a/sbin/ifconfig/iflagg.c
+++ b/sbin/ifconfig/iflagg.c
@@ -3,7 +3,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/iflagg.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index bb021060ea44..307f087702f8 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.4.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 947b96130342..260a0fb43751 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.25.6.1 2008/11/25 02:59:29 kensmith Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 2a388a17e1c8..7d12f02f08e8 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifpfsync.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 89bc9afa602a..aa0c64483740 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.12.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif
 
 #define	NOTAG	((u_short) -1)
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 58a9e0ad0d2e..6a6054b2f3d9 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/init/Makefile,v 1.34.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	init
 MAN=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index bd21b48d2144..9b878feb4faf 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/init/init.8,v 1.50.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 15, 2005
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index ba145be81a23..71204641f986 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/init/init.c,v 1.63.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 335445bb0634..5ee3c6c677f3 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/init/pathnames.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index df57c807a02b..9fb07bc66b54 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/Makefile,v 1.16.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 #.WAIT
 SUBDIR=		libipf
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index 3373b557bd8c..25c7a406c0ca 100644
--- a/sbin/ipf/Makefile.inc
+++ b/sbin/ipf/Makefile.inc
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/Makefile.inc,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib/ipfilter
 CFLAGS+=	-I${.CURDIR}/../../../contrib/ipfilter/tools
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 0a5f4a82c3a2..073f124b3ce8 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/ipf/Makefile,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ipf
 SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
diff --git a/sbin/ipf/ipfs/Makefile b/sbin/ipf/ipfs/Makefile
index a64f805b2ab3..020c7ab1819d 100644
--- a/sbin/ipf/ipfs/Makefile
+++ b/sbin/ipf/ipfs/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipfs/Makefile,v 1.1.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ipfs
 MAN=	ipfs.8
diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile
index a33c5df38d8f..3b2ccd258864 100644
--- a/sbin/ipf/ipfstat/Makefile
+++ b/sbin/ipf/ipfstat/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipfstat/Makefile,v 1.1.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 64ea1cfced23..01f12bab9bfc 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ipftest
 SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 3639f8733c1e..7fc95e1cd564 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ipmon
 SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 1c017e182cb1..a6d015538210 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ipnat
 SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 6e3f85da847d..c84d4a4948ad 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ippool
 SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index 5e0ac15cbb1f..6a96fd418ab7 100644
--- a/sbin/ipf/ipresend/Makefile
+++ b/sbin/ipf/ipresend/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipresend/Makefile,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		ipresend
 SRCS=		ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
diff --git a/sbin/ipf/ipsend/Makefile b/sbin/ipf/ipsend/Makefile
index 4ae4c3441bbb..2685a130a8ab 100644
--- a/sbin/ipf/ipsend/Makefile
+++ b/sbin/ipf/ipsend/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipsend/Makefile,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/iptest/Makefile b/sbin/ipf/iptest/Makefile
index 647471cf4cef..0fcb4cabcdcc 100644
--- a/sbin/ipf/iptest/Makefile
+++ b/sbin/ipf/iptest/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/iptest/Makefile,v 1.1.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile
index 43428cc68f4e..8ca7dd99ea3f 100644
--- a/sbin/ipf/libipf/Makefile
+++ b/sbin/ipf/libipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 LIB=		ipf
 INTERNALLIB=
diff --git a/sbin/ipf/rules/Makefile b/sbin/ipf/rules/Makefile
index a90907fc9853..765a4883cd3d 100644
--- a/sbin/ipf/rules/Makefile
+++ b/sbin/ipf/rules/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/rules/Makefile,v 1.1.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 023f682b25f5..a13f38174418 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfw/Makefile,v 1.14.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ipfw
 SRCS=	ipfw2.c
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index bffcfe736d5c..16d7255ef93f 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.203.2.8.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 5, 2007
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 70dd8c0a068b..f862355da192 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.108.2.10.2.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 2b09fa9aa371..7fc3ea5a41e2 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/iscontrol/Makefile,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
 PROG= iscontrol
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index 8381687fca51..486576a0f3a8 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/auth_subr.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 409ed2c5680d..b9b72e1056fb 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/config.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index 6a1c529a2432..9db4bf6d4375 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/fsm.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/iscontrol.8 b/sbin/iscontrol/iscontrol.8
index 4ae0d3f1d8f2..39ae5a720a80 100644
--- a/sbin/iscontrol/iscontrol.8
+++ b/sbin/iscontrol/iscontrol.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/iscontrol/iscontrol.8,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 22, 2007
 .Dt ISCONTROL 8
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index d5d5929188bd..2e452dd94295 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/iscontrol.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index c93c35af8049..0b8bb9f8fc47 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/iscontrol/iscontrol.h,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 /*
  | $Id: iscontrol.h,v 2.3 2007/04/27 08:36:49 danny Exp danny $
diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5
index 3388746822c5..4a738f7a5410 100644
--- a/sbin/iscontrol/iscsi.conf.5
+++ b/sbin/iscontrol/iscsi.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/iscontrol/iscsi.conf.5,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 5, 2007
 .Os
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index 44ea889a329e..3d2d7087173f 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/login.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index 4ac3f0a349f7..2b24d3e4dbe3 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/misc.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 18dfdfc03b56..4ddb521ea5d9 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/pdu.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/iscontrol/pdu.h b/sbin/iscontrol/pdu.h
index 0154f9e60171..da332911cbe1 100644
--- a/sbin/iscontrol/pdu.h
+++ b/sbin/iscontrol/pdu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/iscontrol/pdu.h,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 /*
  | $Id: pdu.h,v 2.1 2006/11/12 08:06:51 danny Exp $
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index e92daf6c6f7c..1cd5ca325fd7 100644
--- a/sbin/kldconfig/Makefile
+++ b/sbin/kldconfig/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldconfig/Makefile,v 1.3.30.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=		kldconfig
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 18fbaf609ac4..c19226f99596 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldconfig/kldconfig.8,v 1.7.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 15, 2001
 .Dt KLDCONFIG 8
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 403251d2a18f..eacd08254e2c 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index da597d4594f9..3ec5de5bc009 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldload/Makefile,v 1.10.30.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 474404fe1262..1530373a2487 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.27.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 13, 2006
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 9e841bccf908..9b0c0939415a 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldload/kldload.c,v 1.10.30.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index b602a3edfb1f..9278b14bbbe3 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldstat/Makefile,v 1.9.30.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index 6f040e241925..c799b46be086 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.17.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 23, 2005
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 74f375e0ec6c..8936e0a9eab0 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <err.h>
 #include <stdint.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 48e5c035ccdc..59c240a6c97c 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldunload/Makefile,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 0a7937c5ebc4..91fa477c23b2 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.20.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 27, 2006
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 8a3ea6176f66..2d26bc556955 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.17.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 442ae6350713..ad032808f908 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.20.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 9bdf56e4271e..843b1ba25c72 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/elfhints.c,v 1.8.32.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 882459010b30..4484211e3a8f 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.36.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 11, 2005
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 6364653880c4..1c0061aade83 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.47.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc..f16b98937900 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.5.32.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile
index e025a23e4239..deb996d19c54 100644
--- a/sbin/mca/Makefile
+++ b/sbin/mca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mca/Makefile,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
 PROG=	mca
 WARNS?=	4
 MAN=	mca.8
diff --git a/sbin/mca/mca.8 b/sbin/mca/mca.8
index e654d3676173..2bb3b8e08072 100644
--- a/sbin/mca/mca.8
+++ b/sbin/mca/mca.8
@@ -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/sbin/mca/mca.8,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 11, 2006
 .Dt MCA 8
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
index 0c4e1a0c5a80..26d1fbb65a2c 100644
--- a/sbin/mca/mca.c
+++ b/sbin/mca/mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mca/mca.c,v 1.3.32.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 07c4109e0d79..cdb0efb45a3d 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/md5/Makefile,v 1.10.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	md5
 
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index a771fb76132c..8192b1ed188b 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.24.18.1 2008/11/25 02:59:29 kensmith Exp $
 .Dd June 6, 2004
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 7f837a3abced..18cb3bbb8c2b 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/md5/md5.c,v 1.35.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index f4d8adcfde8d..83465b711183 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdconfig/Makefile,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		mdconfig
 MAN=		mdconfig.8
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 2c025d89d344..9ffa8e426b09 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -39,7 +39,7 @@
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 5, 2008
 .Dt MDCONFIG 8
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index d1abf6800fa3..680810b9b143 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 1ef708454267..eb8255985a77 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=		mdmfs
 LINKS=		${BINDIR}/${PROG} ${BINDIR}/mount_mfs
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index ef8e596420d9..c738d72d427b 100644
--- a/sbin/mdmfs/mdmfs.8
+++ b/sbin/mdmfs/mdmfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 15, 2007
 .Dt MDMFS 8
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index bdd880b28542..5dee2453750d 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.33.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mdioctl.h>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index d28d3a595377..9da779f5fda5 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/mknod/Makefile,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mknod
 WARNS?=	0
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 54b544153c97..c0dafe6af8c3 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 15, 2004
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 4c6c399d3fd4..e09e1d2cd6b9 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mknod/mknod.c,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 3c08f565225d..26cb5e34bfcc 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mksnap_ffs
 MAN=	mksnap_ffs.8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8
index 3bd5d9ef34d7..b1991c336ee0 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.8
+++ b/sbin/mksnap_ffs/mksnap_ffs.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.3.20.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 19, 2003
 .Dt MKSNAP_FFS 8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c
index a7ff9572572b..974315863f31 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.c
+++ b/sbin/mksnap_ffs/mksnap_ffs.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 4186f00f6fd1..4f2b20da5454 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount/Makefile,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_fs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 91e2ec480b2e..5403266b6fb9 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/extern.h,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index b9022d9d3fb3..8c1361be1a48 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 0c0e0fed807a..f42870fa7922 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 2fcbbddbbc11..52822b8cc630 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/mntopts.h,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index d1abd5185a19..c5e0bedc2d03 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.82.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 12, 2006
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index c42e9dbede1f..38e2cb21fbae 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount.c,v 1.96.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 6ab15a3b364f..31884fe7fd3e 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_fs.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/sbin/mount/mount_fs.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index aaa0a2c10e1e..78984fbf4696 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 3/27/94
- *	$FreeBSD$
+ *	$FreeBSD: src/sbin/mount/pathnames.h,v 1.3.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index f95a76efdb24..e105b5dad81f 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/vfslist.c,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index e7d040d4d08c..307c869edcae 100644
--- a/sbin/mount_autofs/Makefile
+++ b/sbin/mount_autofs/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2004/09/08 08:27:12 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_autofs/Makefile,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=mount_autofs
 MAN=mount_autofs.8
diff --git a/sbin/mount_autofs/mount_autofs.8 b/sbin/mount_autofs/mount_autofs.8
index 5f10ea72e188..7f23c09bbf7a 100644
--- a/sbin/mount_autofs/mount_autofs.8
+++ b/sbin/mount_autofs/mount_autofs.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: mount_autofs.8,v 1.3 2004/09/08 08:12:21 bright Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_autofs/mount_autofs.8,v 1.3.18.1 2008/11/25 02:59:29 kensmith Exp $
 .Dd August 30, 2004
 .Dt MOUNT_AUTOFS 8
 .Os
diff --git a/sbin/mount_autofs/mount_autofs.c b/sbin/mount_autofs/mount_autofs.c
index 17fbb5b5b6fe..13f3f8208446 100644
--- a/sbin/mount_autofs/mount_autofs.c
+++ b/sbin/mount_autofs/mount_autofs.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $Id: mount_autofs.c,v 1.5 2004/09/08 08:12:21 bright Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_autofs/mount_autofs.c,v 1.4.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 0602d9bbd29c..1dd2c27ea40b 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_cd9660/Makefile,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 909af4019cdf..9d51680b1439 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.30.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 3, 2005
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 9a9bd9d04554..64c9f4cd0a97 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.33.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c0..9526cf3797bc 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ext2fs/Makefile,v 1.7.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_ext2fs
 SRCS=	mount_ext2fs.c getmntopts.c
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 91a315e8bd39..4733e8f13bd6 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.8,v 1.15.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 04d2ea08c86e..abd986a71bc1 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index 084377407787..cd39cb4aeb51 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_hpfs/Makefile,v 1.6.26.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	mount_hpfs
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 0cdcb20e2e15..5a8fc26fb063 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -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/sbin/mount_hpfs/mount_hpfs.8,v 1.11.30.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 20, 1999
 .Dt MOUNT_HPFS 8
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index a9a87e238881..b6106b80bd0f 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -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/sbin/mount_hpfs/mount_hpfs.c,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 8752f0d848a8..4a20f4046f5f 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdosfs/Makefile,v 1.28.6.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	mount_msdosfs
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 6147aa42b137..50a5110ccee0 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -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/sbin/mount_msdosfs/mount_msdosfs.8,v 1.32.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOSFS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 8947644d152c..b3a868cdfbea 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.43.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 4f7efeadd2b1..786b4d80994c 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c mounttab.c
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 93ea3c2caa62..6e8c19a13e06 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.47.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 25, 2005
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 44d45e85760e..6521456d59c6 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -66,7 +66,7 @@ static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.72.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 5938b0dd52a6..7d00267d944b 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.10.18.1 2008/11/25 02:59:29 kensmith Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 059618fd3127..75bea56f2a77 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -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/sbin/mount_ntfs/mount_ntfs.8,v 1.21.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 17, 2007
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 4bd118f2b527..1d53c585421e 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -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/sbin/mount_ntfs/mount_ntfs.c,v 1.14.18.1 2008/11/25 02:59:29 kensmith Exp $
  *
  */
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 5e92c5b5c264..6102bc10c20a 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nullfs/Makefile,v 1.12.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_nullfs
 SRCS=	mount_nullfs.c getmntopts.c
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 177ecdd2cf84..37ef8358a657 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nullfs/mount_nullfs.8,v 1.32.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULLFS 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index a0ad5f681908..10cccebbf27b 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_nullfs/mount_nullfs.c,v 1.26.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_reiserfs/Makefile b/sbin/mount_reiserfs/Makefile
index bd11a4b8ac64..8e0fd8abae88 100644
--- a/sbin/mount_reiserfs/Makefile
+++ b/sbin/mount_reiserfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_reiserfs/Makefile,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG = mount_reiserfs
 SRCS = mount_reiserfs.c getmntopts.c
diff --git a/sbin/mount_reiserfs/mount_reiserfs.8 b/sbin/mount_reiserfs/mount_reiserfs.8
index 7306182667d2..0deb2a29b9da 100644
--- a/sbin/mount_reiserfs/mount_reiserfs.8
+++ b/sbin/mount_reiserfs/mount_reiserfs.8
@@ -29,7 +29,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/sbin/mount_reiserfs/mount_reiserfs.8,v 1.2.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 3, 2005
 .Dt MOUNT_REISERFS 8
diff --git a/sbin/mount_reiserfs/mount_reiserfs.c b/sbin/mount_reiserfs/mount_reiserfs.c
index 5c4e6fcff628..ce9a74a87079 100644
--- a/sbin/mount_reiserfs/mount_reiserfs.c
+++ b/sbin/mount_reiserfs/mount_reiserfs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_reiserfs/mount_reiserfs.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 110a5256cf22..af637360fff5 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/mount_std/Makefile,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_std
 SRCS=	mount_std.c getmntopts.c
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 7575cee0b186..089e3cc807e6 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.24.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 26, 2004
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 3f292b4a9a1d..d6fabfc063ae 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index c5351fdc8782..a250265cfdf8 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_udf/Makefile,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_udf
 SRCS=	mount_udf.c getmntopts.c
diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8
index fb39419aea48..4c037116d6c4 100644
--- a/sbin/mount_udf/mount_udf.8
+++ b/sbin/mount_udf/mount_udf.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_udf/mount_udf.8,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd March 23, 2002
 .Dt MOUNT_UDF 8
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 0175f20f24fd..f32c23601d6c 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_udf/mount_udf.c,v 1.13.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /*
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 35158ab92378..58a19365fc6d 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_unionfs/Makefile,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	mount_unionfs
 SRCS=	mount_unionfs.c getmntopts.c
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 4f661b8bdd1b..68e8ec41f5de 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.22.2.1.4.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 30, 2006
 .Dt MOUNT_UNIONFS 8
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index edb0fff07596..b44a5c8969b9 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -44,7 +44,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_unionfs/mount_unionfs.c,v 1.28.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index c6bf3267a7cf..abcb9e3e6c56 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.9.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG		= natd
 SRCS		= natd.c icmp.c
diff --git a/sbin/natd/README b/sbin/natd/README
index d2e8a9ae6709..e9b1bb268f7d 100644
--- a/sbin/natd/README
+++ b/sbin/natd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/README,v 1.3.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 	A Network Address Translation Daemon for FreeBSD
 
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 1509b965f4b8..2c3d508d06b3 100644
--- a/sbin/natd/icmp.c
+++ b/sbin/natd/icmp.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/icmp.c,v 1.7.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index e0b526c5fc27..8388e149b24d 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.62.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .Dd February 4, 2008
 .Dt NATD 8
 .Os
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 68dfa41438d9..603f49a7bf23 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.50.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #define SYSLOG_NAMES
 
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index a05d1f7e4dca..4efe8d5947dd 100644
--- a/sbin/natd/natd.h
+++ b/sbin/natd/natd.h
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.h,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #define PIDFILE	"/var/run/natd.pid"
diff --git a/sbin/natd/samples/natd.cf.sample b/sbin/natd/samples/natd.cf.sample
index d4dcd714bd92..0810039504d3 100644
--- a/sbin/natd/samples/natd.cf.sample
+++ b/sbin/natd/samples/natd.cf.sample
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/samples/natd.cf.sample,v 1.5.52.1 2008/11/25 02:59:29 kensmith Exp $
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index efbe7abfe492..0a1856b25549 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/Makefile,v 1.22.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	newfs
 DPADD=	${LIBUFS}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index fe862b58f164..d623a4a75689 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.92.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 2794e0ef86ae..8317c113f4f9 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.70.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd March 21, 2008
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 41823cb42e9d..4e9fc03c54d9 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.82.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  * newfs: friendly front end to mkfs
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 55f920f02925..cf53e5efbbcc 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/newfs/newfs.h,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <libufs.h>
diff --git a/sbin/newfs/ref.test b/sbin/newfs/ref.test
index 1967e247d4e5..0265498953a0 100644
--- a/sbin/newfs/ref.test
+++ b/sbin/newfs/ref.test
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/ref.test,v 1.3.30.1 2008/11/25 02:59:29 kensmith Exp $
 00c08266df6b0c79d2673515c182216a
 c00458f223a9119190591e8b8679bf97
 7d5b3c75244898dbb07a4cd20860c8a1
diff --git a/sbin/newfs/runtest00.sh b/sbin/newfs/runtest00.sh
index a95dbcc83b25..b41c39004f5b 100644
--- a/sbin/newfs/runtest00.sh
+++ b/sbin/newfs/runtest00.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest00.sh,v 1.1.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 set -e
 
diff --git a/sbin/newfs/runtest01.sh b/sbin/newfs/runtest01.sh
index 47128326ed24..6e4577850912 100644
--- a/sbin/newfs/runtest01.sh
+++ b/sbin/newfs/runtest01.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest01.sh,v 1.1.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 set -e
 
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 5ee8277d42a9..981e6a90db91 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.11.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	newfs_msdos
 MAN=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 024ed1c188c6..01fbd1f54b4f 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.20.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 1c23b241e638..bffe3945d94b 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42..9cd9a560fcef 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nfsiod/Makefile,v 1.9.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	nfsiod
 WARNS?=	6
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 44bf1af28ad2..01b678dad1a8 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.19.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 31559cc61bd7..97760df3f758 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.18.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index e128b62160f7..a7455a2b5314 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/nos-tun/Makefile,v 1.5.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	nos-tun
 WARNS?=	0
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 405d43007b62..8a0020f11fc5 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.18.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 11, 1998
 .Dt NOS-TUN 8
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 9966840038f7..bdc69f2ade9f 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -57,7 +57,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.14.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index ee5705197e56..24ac1138bd1c 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pfctl/Makefile,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pfctl
 .PATH:	${.CURDIR}/../../sys/contrib/pf/net
diff --git a/sbin/pfctl/missing/altq/altq.h b/sbin/pfctl/missing/altq/altq.h
index c740ed359ad1..bcff8e48569a 100644
--- a/sbin/pfctl/missing/altq/altq.h
+++ b/sbin/pfctl/missing/altq/altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_cbq.h b/sbin/pfctl/missing/altq/altq_cbq.h
index 3c41c6bd836f..1ccd83bdb501 100644
--- a/sbin/pfctl/missing/altq/altq_cbq.h
+++ b/sbin/pfctl/missing/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_cbq.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_cbq.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_classq.h b/sbin/pfctl/missing/altq/altq_classq.h
index 43045b25a630..e9489b815c7b 100644
--- a/sbin/pfctl/missing/altq/altq_classq.h
+++ b/sbin/pfctl/missing/altq/altq_classq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_classq.h,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_hfsc.h b/sbin/pfctl/missing/altq/altq_hfsc.h
index ac242114c084..954aad30eeed 100644
--- a/sbin/pfctl/missing/altq/altq_hfsc.h
+++ b/sbin/pfctl/missing/altq/altq_hfsc.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_hfsc.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_hfsc.h,v 1.10 2003/07/10 12:07:48 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_priq.h b/sbin/pfctl/missing/altq/altq_priq.h
index 526b09235e39..f2299b109fe5 100644
--- a/sbin/pfctl/missing/altq/altq_priq.h
+++ b/sbin/pfctl/missing/altq/altq_priq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_priq.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_priq.h,v 1.5 2003/07/10 12:07:48 kjc Exp $	*/
 /*
  * Copyright (C) 2000-2003
diff --git a/sbin/pfctl/missing/altq/altq_red.h b/sbin/pfctl/missing/altq/altq_red.h
index 96e3fae94fc6..aa4f8b7033b1 100644
--- a/sbin/pfctl/missing/altq/altq_red.h
+++ b/sbin/pfctl/missing/altq/altq_red.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_red.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rio.h b/sbin/pfctl/missing/altq/altq_rio.h
index eda338ae2f1d..5d6b82e36039 100644
--- a/sbin/pfctl/missing/altq/altq_rio.h
+++ b/sbin/pfctl/missing/altq/altq_rio.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rio.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rmclass.h b/sbin/pfctl/missing/altq/altq_rmclass.h
index 87e3e630bb8a..68c86c79b8a1 100644
--- a/sbin/pfctl/missing/altq/altq_rmclass.h
+++ b/sbin/pfctl/missing/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rmclass.h,v 1.2.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rmclass_debug.h b/sbin/pfctl/missing/altq/altq_rmclass_debug.h
index 7fcc86ba129b..abd5505e5ac3 100644
--- a/sbin/pfctl/missing/altq/altq_rmclass_debug.h
+++ b/sbin/pfctl/missing/altq/altq_rmclass_debug.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rmclass_debug.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_var.h b/sbin/pfctl/missing/altq/altq_var.h
index 165b5afe3204..c6a96c03d87f 100644
--- a/sbin/pfctl/missing/altq/altq_var.h
+++ b/sbin/pfctl/missing/altq/altq_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_var.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_var.h,v 1.15 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_wfq.h b/sbin/pfctl/missing/altq/altq_wfq.h
index ca163cf3652d..3a76b80b4642 100644
--- a/sbin/pfctl/missing/altq/altq_wfq.h
+++ b/sbin/pfctl/missing/altq/altq_wfq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_wfq.h,v 1.1.26.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: altq_wfq.h,v 1.8 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
index 01c41d0723f1..859ee3a41b6e 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pflogd/Makefile,v 1.3.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pflogd
 
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 838e1ea7245b..64a3fed5bbaa 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping/Makefile,v 1.20.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ping
 MAN=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index b710991cb6ee..273dc59b5bd4 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.54.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 4, 2006
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 9280bef1e8ef..a2332c7b7395 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.112.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  *			P I N G . C
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 89e7fbe2c6ae..ea59ac8e35e4 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.15.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	ping6
 MAN=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 3897a90c4739..7085ca0b9ffa 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping6/ping6.8,v 1.23.10.3.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 27, 2008
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index f7dba2736503..08553cfaa0b0 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -78,7 +78,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ping6/ping6.c,v 1.31.2.4.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index b54eda312880..e294ab1932cc 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/quotacheck/Makefile,v 1.8.26.1 2008/11/25 02:59:29 kensmith Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index 7856091ded3b..051d460b122a 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/preen.c,v 1.26.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 11952907e406..1635d073e102 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd January 25, 2007
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 1956184f91cf..15f64b544bf2 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.33.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 2ca64cc90b5f..ca68ffac19f6 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -1,5 +1,5 @@
 #       $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/rcorder/Makefile,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index 6a0c570c4e0d..be9da99c3e47 100644
--- a/sbin/rcorder/rcorder.8
+++ b/sbin/rcorder/rcorder.8
@@ -29,7 +29,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/sbin/rcorder/rcorder.8,v 1.4.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 17, 2000
 .Dt RCORDER 8
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 5bf60cb174bc..95e7c507a9b8 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/types.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/stat.h>
 
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 42f086887eb7..511c11d3d0ca 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/Makefile,v 1.15.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	reboot
 WARNS?=	6
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 4b15ccf3f54c..37111fc4cda9 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.61.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 18, 2005
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe04..a94502215879 100644
--- a/sbin/reboot/nextboot.8
+++ b/sbin/reboot/nextboot.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/nextboot.8,v 1.4.32.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 4, 2002
 .Dt NEXTBOOT 8
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 56e53f60a1a9..98ede68d89fa 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -3,7 +3,7 @@
 # Copyright 2002. Gordon Tetlow.
 # gordon@FreeBSD.org
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/nextboot.sh,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 delete="NO"
 force="NO"
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index b9baf344d79d..d0cfbdcef000 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.24.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index de4030771d6c..7554dca36677 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.26.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/reboot.h>
 #include <sys/types.h>
diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 6733a4f8fa20..06762a3d3f9e 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/recoverdisk/Makefile,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	recoverdisk
 WARNS?=	6
diff --git a/sbin/recoverdisk/recoverdisk.1 b/sbin/recoverdisk/recoverdisk.1
index c5526b36f62b..39c69433d308 100644
--- a/sbin/recoverdisk/recoverdisk.1
+++ b/sbin/recoverdisk/recoverdisk.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/recoverdisk/recoverdisk.1,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 6, 2006
 .Dt RECOVERDISK 1
diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c
index 0dc5d7ccf0d7..4e6b7d076731 100644
--- a/sbin/recoverdisk/recoverdisk.c
+++ b/sbin/recoverdisk/recoverdisk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/recoverdisk/recoverdisk.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index c06a3db9116c..40c8b9afb0d2 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/restore/Makefile,v 1.24.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 91bdcd48940e..c1575397d3cf 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/dirs.c,v 1.31.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index cbecc86bd476..d902a3de7cdb 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/extern.h,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 1fffd286c186..ca6d49e26e9e 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/interactive.c,v 1.18.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 91f4a83c7296..63484a152e57 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/main.c,v 1.27.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index cf6a364693b0..7f05d2aa7755 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.53.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 12, 2006
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index e494cdb69a7d..33ecd97da302 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/restore.c,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 8c6a87b8b2f7..89044134a0d5 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)restore.h	8.3 (Berkeley) 9/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/restore.h,v 1.12.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index b7eff268e653..6729a32cc98a 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/symtab.c,v 1.14.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index debed5ff4111..499600fb4555 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 6b984e409749..f6053930667a 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/utilities.c,v 1.14.26.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index ef56dfd9286a..9cb95d9a2c69 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/Makefile,v 1.21.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 130fcd195b2f..c53305713022 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,5 +1,5 @@
 #	@(#)keywords	8.2 (Berkeley) 3/19/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/keywords,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 add
 atalk
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 65a1de166071..8f0a6539ea4b 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/route/route.8,v 1.46.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd October 2, 2005
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 082ac53be0ab..08463d28e6f0 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/route/route.c,v 1.81.2.3.2.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 1ac16c41e32c..dd23f95416b2 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,5 +1,5 @@
 # Make `routed` for FreeBSD
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile,v 1.16.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
index 265f86d1ed55..8027f45e196e 100644
--- a/sbin/routed/Makefile.inc
+++ b/sbin/routed/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile.inc,v 1.4.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 9860e4d77b7f..e2a28f8a409c 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -28,11 +28,11 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/defs.h,v 1.18.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifdef  sgi
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.18.26.1 2008/11/25 02:59:29 kensmith Exp $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index f8038f6a4725..c58507e7d8b7 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/if.c,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -35,7 +35,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/if.c,v 1.16.6.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index f655346bfcad..73bd3a2d1583 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/input.c,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/input.c,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 7c3c5acc8697..1941cf1d768c 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/main.c,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n"
 __RCSID("$NetBSD$");
 #include <util.h>
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.19.6.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.31 $");
 #ident "$Revision: 2.31 $"
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index c9db470b9b46..47505a631eea 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/output.c,v 1.12.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/output.c,v 1.12.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 356ac8e9da36..e7bff614c560 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/parms.c,v 1.14.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -36,7 +36,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/parms.c,v 1.14.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index c45405ed9e55..509d32b99079 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -28,7 +28,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/pathnames.h,v 1.8.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 7f3768853abc..f7a396017197 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -28,7 +28,7 @@
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.c,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 /*
@@ -40,7 +40,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/radix.c,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.23 $");
 #ident "$Revision: 2.23 $"
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 6cf196fa4da6..5e61fb0580b9 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -28,7 +28,7 @@
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.h,v 1.7.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 047b3d123047..2b2cb96220cf 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rdisc.c,v 1.11.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -37,7 +37,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/rdisc.c,v 1.11.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 25998c9bd83c..9104bdb819c7 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.34.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 7076158727f6..81a43a6f9e6a 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` tools for BSD/OS
 # $Revision: 1.6 $
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/rtquery/Makefile,v 1.14.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	rtquery
 MAN=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 4f16e88d5c09..07b93889d0b0 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,5 +1,5 @@
 .\" $Revision: 2.27 $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.20.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 1b3a47bef5da..1e79159d6305 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.17.26.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/cdefs.h>
@@ -62,7 +62,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n"
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.17.26.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 491c5cfa0ab1..381f17217b0a 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/table.c,v 1.21.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/table.c,v 1.21.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 320056f76c8f..641b7d54331e 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/trace.c,v 1.12.18.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #define	RIPCMDS
@@ -39,7 +39,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/trace.c,v 1.12.18.1 2008/11/25 02:59:29 kensmith Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 2086c68d5f29..7e4d2bd70c94 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/rtsol/Makefile,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 525f281b598c..cdca0e894e35 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/savecore/Makefile,v 1.13.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	savecore
 WARNS?=	6
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 487506d655f6..edfcfdc80e5c 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.25.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd February 24, 2005
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 77636488e9e0..d1b1376891f1 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.78.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 5923692aad47..bb04012724f0 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/sconfig/Makefile,v 1.3.28.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	sconfig
 MAN=	sconfig.8
diff --git a/sbin/sconfig/sconfig.8 b/sbin/sconfig/sconfig.8
index 3fe7abcff686..66bfe34ae9b2 100644
--- a/sbin/sconfig/sconfig.8
+++ b/sbin/sconfig/sconfig.8
@@ -10,7 +10,7 @@
 .\" as long as this message is kept with the software, all derivative
 .\" works or modified versions.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.7.18.1 2008/11/25 02:59:29 kensmith Exp $
 .Dd May 19, 2004
 .Dt SCONFIG 8 i386
 .Os
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index 09255a1cc7cf..cf06537fb392 100644
--- a/sbin/sconfig/sconfig.c
+++ b/sbin/sconfig/sconfig.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/sconfig/sconfig.c,v 1.4.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 03c2ea2655dc..eef8566890da 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/Makefile,v 1.14.6.1 2008/11/25 02:59:29 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index a6df24c3547b..f1187f6eeecf 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/parse.y,v 1.9.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: parse.y,v 1.83 2004/05/18 08:48:23 sakane Exp $	*/
 
 /*
diff --git a/sbin/setkey/sample.cf b/sbin/setkey/sample.cf
index c534fa10f1c4..95cd86988913 100644
--- a/sbin/setkey/sample.cf
+++ b/sbin/setkey/sample.cf
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/sample.cf,v 1.4.20.1 2008/11/25 02:59:29 kensmith Exp $
 
 # There are sample scripts for IPsec configuration by manual keying.
 # A security association is uniquely identified by a triple consisting
diff --git a/sbin/setkey/scriptdump.pl b/sbin/setkey/scriptdump.pl
index a1d8adb207bc..e3396776ec91 100644
--- a/sbin/setkey/scriptdump.pl
+++ b/sbin/setkey/scriptdump.pl
@@ -1,5 +1,5 @@
 #! @LOCALPREFIX@/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/scriptdump.pl,v 1.4.24.1 2008/11/25 02:59:29 kensmith Exp $
 
 if ($< != 0) {
 	print STDERR "must be root to invoke this\n";
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 12ef325c985a..031a191043aa 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.38.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd May 13, 2006
 .Dt SETKEY 8
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index 9bb9a88e02ba..b6e615209551 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/setkey.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index 672f03c8512c..5655d346fc7e 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/test-pfkey.c,v 1.3.6.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/test-policy.c b/sbin/setkey/test-policy.c
index 9e9b723e7773..686ec30946db 100644
--- a/sbin/setkey/test-policy.c
+++ b/sbin/setkey/test-policy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/setkey/test-policy.c,v 1.2.6.1 2008/11/25 02:59:29 kensmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index fe4577040735..5f3bc07b4d5e 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/token.l,v 1.13.6.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/vchar.h b/sbin/setkey/vchar.h
index f3251c7bfed3..381943e67ce4 100644
--- a/sbin/setkey/vchar.h
+++ b/sbin/setkey/vchar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/vchar.h,v 1.2.24.1 2008/11/25 02:59:29 kensmith Exp $	*/
 /*	$KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index b7f232d090b5..28c11763b0bf 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/shutdown/Makefile,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index e68687f20b96..330af5c1dc6c 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/shutdown/shutdown.8,v 1.24.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index c4f3f41e6c51..6aef201d71b6 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/shutdown/shutdown.c,v 1.28.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 84b0c1282865..fb689d67e1d0 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/slattach/Makefile,v 1.13.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	slattach
 WARNS?=	0
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index a359dd25605d..23f3dc5c962e 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -27,7 +27,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.29.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index afdfce8a2e71..5a5526259630 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/slattach/slattach.c,v 1.41.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83..bad8cff40f41 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/spppcontrol/Makefile,v 1.6.32.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	spppcontrol
 MAN=	spppcontrol.8
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index 4389c8f66ec1..9b99164fbfc9 100644
--- a/sbin/spppcontrol/spppcontrol.8
+++ b/sbin/spppcontrol/spppcontrol.8
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.16.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 30, 2001
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index a1df0f49942b..618241c49c40 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.13.30.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index 1bf91dd82169..3ae000b215e5 100644
--- a/sbin/startslip/Makefile
+++ b/sbin/startslip/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/startslip/Makefile,v 1.10.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	startslip
 WARNS?=	3
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 2d6f43b3c52e..a1db47a21b92 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.24.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index 2d4d3bfb124a..b15b0c16b462 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/startslip/startslip.c,v 1.38.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 143b6c72bb0f..a29816cd0331 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/sunlabel/runtest.sh b/sbin/sunlabel/runtest.sh
index 73833e0b7fee..ab680802a3e0 100644
--- a/sbin/sunlabel/runtest.sh
+++ b/sbin/sunlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/runtest.sh,v 1.3.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/sunlabel/sunlabel.8 b/sbin/sunlabel/sunlabel.8
index 60096048dafa..e9058e66dbd5 100644
--- a/sbin/sunlabel/sunlabel.8
+++ b/sbin/sunlabel/sunlabel.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sunlabel/sunlabel.8,v 1.6.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd March 30, 2005
 .Dt SUNLABEL 8
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index 7bf051ef4786..ab6d107b96dc 100644
--- a/sbin/sunlabel/sunlabel.c
+++ b/sbin/sunlabel/sunlabel.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.13.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 85b0f0ab60bb..cf526ed47a79 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/swapon/Makefile,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	swapon
 MAN=	swapon.8
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index f4ecd14145f7..cfcd81786a10 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.29.18.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd December 28, 2002
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 13297f9178dc..a3e6d2696497 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.22.18.1 2008/11/25 02:59:29 kensmith Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 381f19918be3..993e7b57cb35 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/sysctl/Makefile,v 1.9.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	sysctl
 WARNS?=	0
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 4084290284e1..bf3ff220757e 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.61.2.1.4.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd November 28, 2007
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 9dcfcb06bfd9..5ac2c85c9090 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.86.6.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b7..bd78fd1dcb78 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/tunefs/Makefile,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	tunefs
 DPADD=	${LIBUFS}
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 245aa361f257..233d84efbc96 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.39.6.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd August 13, 2007
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 2b263bb343c8..ad555ca84c19 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.43.6.1 2008/11/25 02:59:29 kensmith Exp $");
 
 /*
  * tunefs: change layout parameters to an existing file system.
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 70ccc5a06624..5b7156b34e28 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/umount/Makefile,v 1.11.26.1 2008/11/25 02:59:29 kensmith Exp $
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d19ea9ae7a49..265b89838bd1 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.20.26.1 2008/11/25 02:59:29 kensmith Exp $
 .\"
 .Dd July 18, 2003
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index c00a09d8da22..c30c1d03ce65 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/umount/umount.c,v 1.45.18.1 2008/11/25 02:59:29 kensmith Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
author	Ken Smith <kensmith@FreeBSD.org>	2008-12-31 22:57:14 +0000
committer	Ken Smith <kensmith@FreeBSD.org>	2008-12-31 22:57:14 +0000
commit	8d4eb975d2e49f56d057a19aac09bcb92b3e71f7 (patch)
tree	1b808490e2ba26bfe983f82bd41a2b36a6127322 /sbin
parent	a1fc2b0c89a1dd2ca090ae990ab45b21363ab76e (diff)